Merge 6b5e8bd into 409eef1

appveyor.yml

@@ -21,7 +21,7 @@ init:
 
 install:
   - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
-  - python -m pip install -U pip
+  - python -m pip install -U pip setuptools
   - pip install -e .
   - pip install securesystemslib[crypto,pynacl]
 

ci-requirements.txt

@@ -7,3 +7,4 @@ bandit
 # Pin to versions supported by `coveralls` (see .travis.yml)
 # https://github.com/coveralls-clients/coveralls-python/releases/tag/1.8.1
 coverage<5.0
+mock; python_version < "3.3"

dev-requirements.txt

@@ -40,6 +40,7 @@ iso8601==0.1.12
 isort==4.3.21
 lazy-object-proxy==1.4.3
 mccabe==0.6.1
+mock==3.0.5; python_version < "3.3"
 more-itertools==7.2.0 ; python_version >= "3.0" # via zipp
 more-itertools==5.0.0 ; python_version < "3.0" # pyup: ignore
 packaging==19.2 # via tox

setup.py

@@ -116,6 +116,9 @@
     'six>=1.11.0',
     'securesystemslib>=0.12.0'
   ],
+  tests_require = [
+    'mock; python_version < "3.3"'
+  ],
   packages = find_packages(exclude=['tests']),
   scripts = [
     'tuf/scripts/repo.py',

tests/test_repository_tool.py

@@ -357,7 +357,7 @@ def test_writeall(self):
     self.assertEqual([], tuf.roledb.get_dirty_roles(repository_name))
 
     repository.mark_dirty(['root', 'timestamp'])
-    self.assertEqual(['root', 'timestamp'], sorted(tuf.roledb.get_dirty_roles(repository_name)))
+    self.assertEqual(['root', 'timestamp'], tuf.roledb.get_dirty_roles(repository_name))
     repository.unmark_dirty(['root'])
     self.assertEqual(['timestamp'], tuf.roledb.get_dirty_roles(repository_name))
 

tests/test_roledb.py

@@ -710,7 +710,7 @@ def test_mark_dirty(self):
     self.assertEqual([rolename], tuf.roledb.get_dirty_roles())
 
     tuf.roledb.mark_dirty(['dirty_role'])
-    self.assertEqual([rolename2, rolename], sorted(tuf.roledb.get_dirty_roles()))
+    self.assertEqual([rolename2, rolename], tuf.roledb.get_dirty_roles())
 
     # Verify that a role cannot be marked as dirty for a non-existent
     # repository.
@@ -735,9 +735,9 @@ def test_unmark_dirty(self):
     tuf.roledb.update_roleinfo(rolename2, roleinfo2, mark_role_as_dirty)
 
     tuf.roledb.unmark_dirty(['dirty_role'])
-    self.assertEqual([rolename], sorted(tuf.roledb.get_dirty_roles()))
+    self.assertEqual([rolename], tuf.roledb.get_dirty_roles())
     tuf.roledb.unmark_dirty(['targets'])
-    self.assertEqual([], sorted(tuf.roledb.get_dirty_roles()))
+    self.assertEqual([], tuf.roledb.get_dirty_roles())
 
     # What happens for a role that isn't dirty?  unmark_dirty() should just
     # log a message.