Part 6 of Merge Commit with theupdateframework/develop TUF 1.0: fixing bug in test caused by previous commit: delegations may no longer specify directories to imply all contents of those directories, but must now explicitly specify e.g. 'foo/*'

Author: awwad

tests/test_updater.py

@@ -1112,23 +1112,17 @@ def test_6_target_mrd(self):
 
     # Let's multi-role delegate! role2 and role3 together can specify foo.
     # So can role4 and role5 together.
-    repository.targets.multi_role_delegate([foo_directory], ['role2',
-        'role3'])
-    repository.targets.multi_role_delegate([foo_directory], ['role4',
-        'role5'])
+    repository.targets.multi_role_delegate([os.path.join(foo_directory, '*')],
+        ['role2', 'role3'])
+    repository.targets.multi_role_delegate([os.path.join(foo_directory, '*')],
+        ['role4', 'role5'])
 
     # Write & sign the metadata, then copy it all from "staged" to "live".
     repository.write()
     shutil.rmtree(os.path.join(self.repository_directory, 'metadata'))
     shutil.copytree(os.path.join(self.repository_directory, 'metadata.staged'),
                     os.path.join(self.repository_directory, 'metadata'))
 
-    # # BONUS COPY for human inspection
-    # shutil.rmtree(os.path.join('/Users/s/w/tuf/zorp', 'metadata'))
-    # shutil.copytree(os.path.join(self.repository_directory, 'metadata.staged'),
-    #                 os.path.join('/Users/s/w/tuf/zorp', 'metadata'))
-
-
     # Try updating target info for foo_package.
     # updater.target() should find 'foo1.1.tar.gz' by backtracking to
     # 'role3'.  'role2' allows backtracking.