pythongh-93005: Fixes launcher test when no Python install is availab…

…le (pythonGH-93007)
miss-islington · May 23, 2022 · 949dbf9 · 949dbf9
1 parent d5f0dd1
commit 949dbf9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
@@ -245,7 +245,7 @@ def script(self, content, encoding="utf-8"):
             file.unlink()
 
     @contextlib.contextmanager
-    def test_venv(self):
+    def fake_venv(self):
         venv = Path.cwd() / "Scripts"
         venv.mkdir(exist_ok=True, parents=True)
         venv_exe = (venv / Path(sys.executable).name)
@@ -462,7 +462,7 @@ def test_py_default_in_list(self):
         self.assertEqual("PythonTestSuite/3.100", default)
 
     def test_virtualenv_in_list(self):
-        with self.test_venv() as (venv_exe, env):
+        with self.fake_venv() as (venv_exe, env):
             data = self.run_py(["-0p"], env=env)
             for line in data["stdout"].splitlines():
                 m = re.match(r"\s*\*\s+(.+)$", line)
@@ -482,9 +482,9 @@ def test_virtualenv_in_list(self):
                 self.fail("did not find active venv entry")
 
     def test_virtualenv_with_env(self):
-        with self.test_venv() as (venv_exe, env):
-            data1 = self.run_py([], env={**env, "PY_PYTHON": "-3"})
-            data2 = self.run_py(["-3"], env={**env, "PY_PYTHON": "-3"})
+        with self.fake_venv() as (venv_exe, env):
+            data1 = self.run_py([], env={**env, "PY_PYTHON": "PythonTestSuite/3"})
+            data2 = self.run_py(["-3"], env={**env, "PY_PYTHON": "PythonTestSuite/3"})
         # Compare stdout, because stderr goes via ascii
         self.assertEqual(data1["stdout"].strip(), str(venv_exe))
         self.assertEqual(data1["SearchInfo.lowPriorityTag"], "True")

diff --git a/PC/launcher2.c b/PC/launcher2.c
@@ -972,16 +972,16 @@ checkDefaults(SearchInfo *search)
         if (!slash) {
             search->tag = tag;
             search->tagLength = n;
-            // gh-92817: allow a high priority env to be selected even if it
-            // doesn't match the tag
-            search->lowPriorityTag = true;
         } else {
             search->company = tag;
             search->companyLength = (int)(slash - tag);
             search->tag = slash + 1;
             search->tagLength = n - (search->companyLength + 1);
             search->oldStyleTag = false;
         }
+        // gh-92817: allow a high priority env to be selected even if it
+        // doesn't match the tag
+        search->lowPriorityTag = true;
     }
 
     return 0;