Apply changes from code review

spyder-ide · Mar 5, 2024 · 374d4da · 374d4da
1 parent e103465
commit 374d4da
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/spyder/utils/tests/test_conda.py b/spyder/utils/tests/test_conda.py
@@ -65,12 +65,17 @@ def test_get_conda_root_prefix():
 
 @pytest.mark.skipif(not running_in_ci(), reason="Only meant for CIs")
 def test_find_conda():
+    # Standard test
+    assert find_conda()
+
+    # Test with test environment
     # Temporarily remove CONDA_EXE and MAMBA_EXE, if present
     conda_exe = os.environ.pop('CONDA_EXE', None)
     mamba_exe = os.environ.pop('MAMBA_EXE', None)
 
-    assert find_conda()
+    assert find_conda(TEST_PYEXEC)
 
+    # Restore os.environ
     if conda_exe is not None:
         os.environ['CONDA_EXE'] = conda_exe
     if mamba_exe is not None: