Merge pull request #158 from notatallshaw/add-unvisited-tests

Add unvisited tests to ensure backjumping

tests/conftest.py

@@ -8,13 +8,16 @@
 class TestReporter(BaseReporter):
     def __init__(self):
         self._indent = 0
+        self.visited = []
 
     def rejecting_candidate(self, criterion, candidate):
         self._indent -= 1
+        self.visited.append(candidate)
         print(" " * self._indent, "Reject ", candidate, sep="")
 
     def pinning(self, candidate):
         print(" " * self._indent, "Pin  ", candidate, sep="")
+        self.visited.append(candidate)
         self._indent += 1
 
 

tests/functional/python/inputs/case/backjump-test-1.json

@@ -11,5 +11,8 @@
 		"sat-stac": "0.1.1",
 		"python-dateutil": "2.7.5",
 		"requests": "2.31.0"
+	},
+	"unvisited": {
+		"pystac": ["1.8.2"]
 	}
 }

tests/functional/python/inputs/case/backjump-test-2.json

@@ -13,5 +13,8 @@
 		"sat-stac": "0.1.1",
 		"python-dateutil": "2.7.5",
 		"requests": "2.31.0"
+	},
+	"unvisited": {
+		"pystac": ["1.8.2"]
 	}
 }

tests/functional/python/test_resolvers_python.py

@@ -1,9 +1,8 @@
-from __future__ import print_function
-
 import collections
 import json
 import operator
 import os
+from collections import defaultdict
 
 import packaging.markers
 import packaging.requirements
@@ -64,6 +63,11 @@ def __init__(self, filename):
         else:
             self.expected_confliction = None
 
+        if "unvisited" in case_data:
+            self.expected_unvisited = case_data["unvisited"]
+        else:
+            self.expected_unvisited = None
+
     def identify(self, requirement_or_candidate):
         name = packaging.utils.canonicalize_name(requirement_or_candidate.name)
         if requirement_or_candidate.extras:
@@ -174,3 +178,21 @@ def test_resolver(provider, reporter):
     else:
         resolution = resolver.resolve(provider.root_requirements)
         assert _format_resolution(resolution) == provider.expected_resolution
+
+    if provider.expected_unvisited:
+        visited_versions = defaultdict(set)
+        for visited_candidate in reporter.visited:
+            visited_versions[visited_candidate.name].add(
+                str(visited_candidate.version)
+            )
+
+        for name, versions in provider.expected_unvisited.items():
+            if name not in visited_versions:
+                continue
+
+            unexpected_versions = set(versions).intersection(
+                visited_versions[name]
+            )
+            assert (
+                not unexpected_versions
+            ), f"Unexpcted versions visited {name}: {', '.join(unexpected_versions)}"