From 8431c8c35637bb78ddd348f27bc8039bb265c5c8 Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 1 Oct 2024 11:14:15 -0700 Subject: [PATCH] Use new exe type in tests --- tests/test_examples.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_examples.py b/tests/test_examples.py index 1917c5c28..3e4405f1f 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -845,7 +845,7 @@ def test_virtual_specs_ok(tmp_path, request): @pytest.mark.xfail( - CONDA_EXE == "conda-standalone" and Version(CONDA_EXE_VERSION) < Version("24.9.0"), + CONDA_EXE == StandaloneExe.CONDA and CONDA_EXE_VERSION < Version("24.9.0"), reason="Pre-existing .condarc breaks installation", ) def test_ignore_condarc_files(tmp_path, monkeypatch, request): @@ -855,7 +855,7 @@ def test_ignore_condarc_files(tmp_path, monkeypatch, request): # HOME or USERPROFILE breaks installer builds. # mamba does not search this directory, so use HOME as a fallback. # Since micromamba is not supported on Windows, this is not a problem. - if CONDA_EXE == "micromamba": + if CONDA_EXE == StandaloneExe.MAMBA: monkeypatch.setenv("HOME", str(tmp_path)) condarc = tmp_path / ".condarc" else: @@ -879,7 +879,7 @@ def test_ignore_condarc_files(tmp_path, monkeypatch, request): check_subprocess=True, uninstall=True, ) - if CONDA_EXE == "micromamba" and installer.suffix == ".sh": + if CONDA_EXE == StandaloneExe.MAMBA and installer.suffix == ".sh": # micromamba loads the rc files even for constructor subcommands. # This cannot be turned off with --no-rc, which causes four errors # in stderr. If there are more, other micromamba calls have read