summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-07 11:03:29 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-07 11:03:29 +0000
commit1265057958aeb310d22fef5d1d41405f259df5ea (patch)
tree628363dc8c3ea2fe9742ada5eaba63535244c6ee
parentdfbb9ddb4fc6799a83c4e6721cc76527dad5595b (diff)
downloadimport-1265057958aeb310d22fef5d1d41405f259df5ea.tar.gz
add test_eqs_nt_eqs
-rwxr-xr-xexts/pip_find_deps_tests.py25
1 files changed, 17 insertions, 8 deletions
diff --git a/exts/pip_find_deps_tests.py b/exts/pip_find_deps_tests.py
index 5549c7b..3309409 100755
--- a/exts/pip_find_deps_tests.py
+++ b/exts/pip_find_deps_tests.py
@@ -28,9 +28,6 @@ class ConflictDetectionTests(unittest.TestCase):
reqs = ['a == 0.1', 'a == 0.2']
self.test_requirements = parse_requirements(reqs)
- # ('==', '0.1') conflicts with ('>', 0.1)
- # ('==', '0.1') conflicts with ('!=', 0.1)
-
# ('<', '0.1') conflicts with ('>', '0.1')
# ('<=', 0.1) conflicts with ('>=', 0.2)
# ('<', '0.1') conflicts with ('>', '0.2')
@@ -48,7 +45,7 @@ class ConflictDetectionTests(unittest.TestCase):
self.assertEqual(dep.conflicts, [(('==', parse_version('0.1')),
('==', parse_version('0.2')))])
- def run_test_lt_gt(self, requirements, expected_conflicts):
+ def run_conflict_test(self, requirements, expected_conflicts):
deps = pip_find_deps.resolve_version_constraints(requirements)
self.assertEqual(len(deps), 1)
@@ -65,10 +62,10 @@ class ConflictDetectionTests(unittest.TestCase):
('<', parse_version('0.1')))]
# ('==', '0.1') conflicts with ('<', 0.1)
- self.run_test_lt_gt(requirements, expected_conflicts)
+ self.run_conflict_test(requirements, expected_conflicts)
# ('<', 0.1) conflicts with ('==', '0.1')
- self.run_test_lt_gt(reverse(requirements), reverse(expected_conflicts))
+ self.run_conflict_test(reverse(requirements), reverse(expected_conflicts))
def test_greater_than(self):
requirements = list(parse_requirements(['a == 0.1', 'a > 0.1']))
@@ -76,10 +73,22 @@ class ConflictDetectionTests(unittest.TestCase):
('>', parse_version('0.1')))]
# ('==', '0.1') conflicts with ('>', 0.1)
- self.run_test_lt_gt(requirements, expected_conflicts)
+ self.run_conflict_test(requirements, expected_conflicts)
# ('>', 0.1) conflicts with ('==', '0.1')
- self.run_test_lt_gt(reverse(requirements), reverse(expected_conflicts))
+ self.run_conflict_test(reverse(requirements), reverse(expected_conflicts))
+
+ def test_eqs_nt_eqs(self):
+ requirements = list(parse_requirements(['a == 0.1', 'a != 0.1']))
+ expected_conflicts = [(('==', parse_version('0.1')),
+ ('!=', parse_version('0.1')))]
+
+ # ('==', '0.1') conflicts with ('!=', '0.1')
+ self.run_conflict_test(requirements, expected_conflicts)
+
+ # ('!=', '0.1') conflicts with ('==', '0.1')
+ #self.run_conflict_test(reverse(requirements), reverse(expected_conflicts))
+
if __name__ == '__main__':
suite = unittest.TestLoader().loadTestsFromTestCase(ConflictDetectionTests)