Update integration tests following map file changes

Signed-off-by: Vladimir Diaz <vladimir.v.diaz@gmail.com>

tests/test_arbitrary_package_attack.py

@@ -110,7 +110,7 @@ def setUp(self):
     # We are inheriting from custom class.
     unittest_toolbox.Modified_TestCase.setUp(self)
 
-    self.repository_name = 'test_repository'
+    self.repository_name = 'test_repository1'
 
     # Copy the original repository files provided in the test folder so that
     # any modifications made to repository files are restricted to the copies.
@@ -159,7 +159,7 @@ def tearDown(self):
     # Modified_TestCase.tearDown() automatically deletes temporary files and
     # directories that may have been created during each test case.
     unittest_toolbox.Modified_TestCase.tearDown(self)
-    # updater.Updater() populates the roledb with the name "test_repository"
+    # updater.Updater() populates the roledb with the name "test_repository1"
     tuf.roledb.clear_roledb(clear_all=True)
     tuf.keydb.clear_keydb(clear_all=True)
 

tests/test_endless_data_attack.py

@@ -112,7 +112,7 @@ def setUp(self):
     # We are inheriting from custom class.
     unittest_toolbox.Modified_TestCase.setUp(self)
 
-    self.repository_name = 'test_repository'
+    self.repository_name = 'test_repository1'
 
     # Copy the original repository files provided in the test folder so that
     # any modifications made to repository files are restricted to the copies.

tests/test_extraneous_dependencies_attack.py

@@ -115,7 +115,7 @@ def setUp(self):
     # We are inheriting from custom class.
     unittest_toolbox.Modified_TestCase.setUp(self)
 
-    self.repository_name = 'test_repository'
+    self.repository_name = 'test_repository1'
 
     # Copy the original repository files provided in the test folder so that
     # any modifications made to repository files are restricted to the copies.

tests/test_indefinite_freeze_attack.py

@@ -122,7 +122,7 @@ def tearDownClass(cls):
   def setUp(self):
     # We are inheriting from custom class.
     unittest_toolbox.Modified_TestCase.setUp(self)
-    self.repository_name = 'test_repository'
+    self.repository_name = 'test_repository1'
 
     # Copy the original repository files provided in the test folder so that
     # any modifications made to repository files are restricted to the copies.

tests/test_interpose_updater.py

@@ -108,7 +108,7 @@ def setUp(self):
     # for each test case.
     original_repository = os.path.join(original_repository_files, 'repository')
     original_keystore = os.path.join(original_repository_files, 'keystore')
-    original_client = os.path.join(original_repository_files, 'client', 'test_repository')
+    original_client = os.path.join(original_repository_files, 'client', 'test_repository1')
 
     # Save references to the often-needed client repository directories.
     # Test cases need these references to access metadata and target files.
@@ -364,7 +364,7 @@ def setUp(self):
     # for each test case.
     original_repository = os.path.join(original_repository_files, 'repository')
     original_keystore = os.path.join(original_repository_files, 'keystore')
-    original_client = os.path.join(original_repository_files, 'client', 'test_repository')
+    original_client = os.path.join(original_repository_files, 'client', 'test_repository1')
 
     # Save references to the often-needed client repository directories.
     # Test cases need these references to access metadata and target files.

tests/test_key_revocation_integration.py

@@ -112,7 +112,7 @@ def setUp(self):
     # We are inheriting from custom class.
     unittest_toolbox.Modified_TestCase.setUp(self)
 
-    self.repository_name = 'test_repository'
+    self.repository_name = 'test_repository1'
 
     # Copy the original repository files provided in the test folder so that
     # any modifications made to repository files are restricted to the copies.

tests/test_mix_and_match_attack.py

@@ -117,7 +117,7 @@ def setUp(self):
     # We are inheriting from custom class.
     unittest_toolbox.Modified_TestCase.setUp(self)
 
-    self.repository_name = 'test_repository'
+    self.repository_name = 'test_repository1'
 
     # Copy the original repository files provided in the test folder so that
     # any modifications made to repository files are restricted to the copies.

tests/test_multiple_repositories_integration.py

@@ -70,7 +70,7 @@ def setUp(self):
     # The original repository, keystore, and client directories will be copied
     # for each test case.
     original_repository = os.path.join(original_repository_files, 'repository')
-    original_client = os.path.join(original_repository_files, 'client', 'test_repository')
+    original_client = os.path.join(original_repository_files, 'client', 'test_repository1')
     original_keystore = os.path.join(original_repository_files, 'keystore')
     original_map_file = os.path.join(original_repository_files, 'map.json')
 
@@ -85,8 +85,8 @@ def setUp(self):
     # directory copied from the original repository files.
     tuf.settings.repositories_directory = self.temporary_repository_root
 
-    repository_name = 'repository1'
-    repository_name2 = 'repository2'
+    repository_name = 'test_repository1'
+    repository_name2 = 'test_repository2'
     self.client_directory = os.path.join(self.temporary_repository_root, repository_name)
     self.client_directory2 = os.path.join(self.temporary_repository_root, repository_name2)
 
@@ -177,41 +177,41 @@ def tearDown(self):
       logger.info('Server 2 process ' + str(self.server_process2.pid) + ' terminated.')
       self.server_process2.kill()
 
-    # updater.Updater() populates the roledb with the name "test_repository"
+    # updater.Updater() populates the roledb with the name "test_repository1"
     tuf.roledb.clear_roledb(clear_all=True)
     tuf.keydb.clear_keydb(clear_all=True)
 
 
 
   def test_update(self):
-    self.assertEqual('repository1', str(self.repository_updater))
-    self.assertEqual('repository2', str(self.repository_updater2))
+    self.assertEqual('test_repository1', str(self.repository_updater))
+    self.assertEqual('test_repository2', str(self.repository_updater2))
 
     self.assertEqual(sorted(['role1', 'root', 'snapshot', 'targets', 'timestamp']),
-        sorted(tuf.roledb.get_rolenames('repository1')))
+        sorted(tuf.roledb.get_rolenames('test_repository1')))
 
     self.assertEqual(sorted(['role1', 'root', 'snapshot', 'targets', 'timestamp']),
-        sorted(tuf.roledb.get_rolenames('repository2')))
+        sorted(tuf.roledb.get_rolenames('test_repository2')))
 
     self.repository_updater.refresh()
 
     self.assertEqual(sorted(['role1', 'root', 'snapshot', 'targets', 'timestamp']),
-        sorted(tuf.roledb.get_rolenames('repository1')))
+        sorted(tuf.roledb.get_rolenames('test_repository1')))
     self.assertEqual(sorted(['role1', 'root', 'snapshot', 'targets', 'timestamp']),
-        sorted(tuf.roledb.get_rolenames('repository2')))
+        sorted(tuf.roledb.get_rolenames('test_repository2')))
 
     # 'role1.json' should be downloaded, because it provides info for the
     # requested 'file3.txt'.
     valid_targetinfo = self.repository_updater.get_one_valid_targetinfo('/file3.txt')
 
     self.assertEqual(sorted(['role2', 'role1', 'root', 'snapshot', 'targets', 'timestamp']),
-        sorted(tuf.roledb.get_rolenames('repository1')))
+        sorted(tuf.roledb.get_rolenames('test_repository1')))
 
 
 
   def test_repository_tool(self):
-    repository_name = 'repository1'
-    repository_name2 = 'repository2'
+    repository_name = 'test_repository1'
+    repository_name2 = 'test_repository2'
 
     self.assertEqual(repository_name, str(self.repository_updater))
     self.assertEqual(repository_name2, str(self.repository_updater2))

tests/test_replay_attack.py

@@ -116,7 +116,7 @@ def setUp(self):
     # We are inheriting from custom class.
     unittest_toolbox.Modified_TestCase.setUp(self)
 
-    self.repository_name = 'test_repository'
+    self.repository_name = 'test_repository1'
 
     # Copy the original repository files provided in the test folder so that
     # any modifications made to repository files are restricted to the copies.

tests/test_slow_retrieval_attack.py

@@ -123,7 +123,7 @@ def setUp(self):
     # We are inheriting from custom class.
     unittest_toolbox.Modified_TestCase.setUp(self)
 
-    self.repository_name = 'test_repository'
+    self.repository_name = 'test_repository1'
 
     # Copy the original repository files provided in the test folder so that
     # any modifications made to repository files are restricted to the copies.

tests/test_updater_root_rotation_integration.py

@@ -117,7 +117,7 @@ def setUp(self):
     # We are inheriting from custom class.
     unittest_toolbox.Modified_TestCase.setUp(self)
 
-    self.repository_name = 'test_repository'
+    self.repository_name = 'test_repository1'
 
     # Copy the original repository files provided in the test folder so that
     # any modifications made to repository files are restricted to the copies.