Update tests!

Author: pradyunsg

tests/conftest.py

@@ -99,12 +99,24 @@ def resolver_variant(request):
 
     # Handle the environment variables for this test.
     features = set(os.environ.get("PIP_USE_FEATURE", "").split())
-    if new_resolver:
-        features.add("2020-resolver")
+    deprecated_features = set(os.environ.get("PIP_USE_DEPRECATED", "").split())
+
+    if six.PY3:
+        if resolver == "legacy":
+            deprecated_features.add("legacy-resolver")
+        else:
+            deprecated_features.discard("legacy-resolver")
     else:
-        features.discard("2020-resolver")
+        if resolver == "2020-resolver":
+            features.add("2020-resolver")
+        else:
+            features.discard("2020-resolver")
 
-    with patch.dict(os.environ, {"PIP_USE_FEATURE": " ".join(features)}):
+    env = {
+        "PIP_USE_FEATURE": " ".join(features),
+        "PIP_USE_DEPRECATED": " ".join(deprecated_features),
+    }
+    with patch.dict(os.environ, env):
         yield resolver
 
 

tests/functional/test_install.py

@@ -407,7 +407,7 @@ def test_vcs_url_urlquote_normalization(script, tmpdir):
     )
 
 
-@pytest.mark.parametrize("resolver", ["", "--use-feature=2020-resolver"])
+@pytest.mark.parametrize("resolver", ["", "--use-deprecated=legacy-resolver"])
 def test_basic_install_from_local_directory(
     script, data, resolver, with_wheel
 ):