Remove some cruft by preparing the peers paths only once in before_each and use

them in tests.

Author: jonasbardino

tests/test_mig_shared_useradm.py

@@ -364,6 +364,7 @@ class TestMigSharedUseradm_search_peers(MigTestCase, UserAssertMixin):
     OTHER_EXTERNAL_DN = '/C=DK/ST=NA/L=NA/O=Other Company/OU=NA/CN=Other User/emailAddress=other@company.com'
 
     def _provide_configuration(self):
+        """Return isolated test configuration"""
         return 'testconfig'
 
     def before_each(self):
@@ -376,18 +377,16 @@ def before_each(self):
         ensure_dirs_exist(self.configuration.resource_pending)
         ensure_dirs_exist(self.configuration.mig_system_files)
         self._provision_test_user(self, self.TEST_USER_DN)
-        test_settings = os.path.join(self.configuration.user_settings,
-                                     client_id_dir(self.TEST_USER_DN))
-        ensure_dirs_exist(test_settings)
+        self.test_user_settings = os.path.join(self.configuration.user_settings,
+                                               client_id_dir(self.TEST_USER_DN))
+        ensure_dirs_exist(self.test_user_settings)
+        self.test_user_peers = os.path.join(self.test_user_settings, 'peers')
 
     def test_search_peers_with_match(self):
         """Test search_peers with a matching peer"""
 
         contact_id = self.TEST_USER_DN
-        client_dir = client_id_dir(contact_id)
-        peers_dir = os.path.join(self.configuration.user_settings, client_dir)
-        ensure_dirs_exist(peers_dir)
-        peers_path = os.path.join(peers_dir, 'peers')
+        peers_path = self.test_user_peers
         peer_id = self.TEST_EXTERNAL_DN
         peer_entry = {
             'peer_id': peer_id,
@@ -408,10 +407,7 @@ def test_search_peers_with_regex_match(self):
         """Test search_peers with regex matching"""
 
         contact_id = self.TEST_USER_DN
-        client_dir = client_id_dir(contact_id)
-        peers_dir = os.path.join(self.configuration.user_settings, client_dir)
-        ensure_dirs_exist(peers_dir)
-        peers_path = os.path.join(peers_dir, 'peers')
+        peers_path = self.test_user_peers
         peer_id = self.TEST_EXTERNAL_DN
         peer_entry = {
             'peer_id': peer_id,
@@ -432,10 +428,7 @@ def test_search_peers_with_regex_match(self):
     def test_search_peers_no_match(self):
         """Test search_peers with no matching peers"""
         contact_id = self.TEST_USER_DN
-        client_dir = client_id_dir(contact_id)
-        peers_dir = os.path.join(self.configuration.user_settings, client_dir)
-        ensure_dirs_exist(peers_dir)
-        peers_path = os.path.join(peers_dir, 'peers')
+        peers_path = self.test_user_peers
         peer_id = self.TEST_EXTERNAL_DN
         peer_entry = {
             'peer_id': peer_id,
@@ -461,10 +454,7 @@ def test_search_peers_no_peers_file(self):
     def test_search_peers_empty_peers_file(self):
         """Test search_peers with empty peers file"""
         contact_id = self.TEST_USER_DN
-        client_dir = client_id_dir(contact_id)
-        peers_dir = os.path.join(self.configuration.user_settings, client_dir)
-        ensure_dirs_exist(peers_dir)
-        peers_path = os.path.join(peers_dir, 'peers')
+        peers_path = self.test_user_peers
         dump({}, peers_path)
 
         (conf, hits) = search_peers(contact_id, {
@@ -474,10 +464,7 @@ def test_search_peers_empty_peers_file(self):
     def test_search_peers_multiple_matches(self):
         """Test search_peers with multiple matching peers"""
         contact_id = self.TEST_USER_DN
-        client_dir = client_id_dir(contact_id)
-        peers_dir = os.path.join(self.configuration.user_settings, client_dir)
-        ensure_dirs_exist(peers_dir)
-        peers_path = os.path.join(peers_dir, 'peers')
+        peers_path = self.test_user_peers
         peer1 = self.TEST_EXTERNAL_DN
         peer2 = self.OTHER_EXTERNAL_DN
         peer_entry1 = {