diff --git a/libmamba/src/api/list.cpp b/libmamba/src/api/list.cpp index 89f939e4f2..1539bc817a 100644 --- a/libmamba/src/api/list.cpp +++ b/libmamba/src/api/list.cpp @@ -218,8 +218,8 @@ namespace mamba { if (options.canonical) { - std::cout << "Warning: Option --canonical ignored because of --explicit \n" - << std::endl; + LOG_WARNING << "Warning: Option --canonical ignored because of --explicit" + << std::endl; } for (auto p : packages) { diff --git a/micromamba/tests/test_list.py b/micromamba/tests/test_list.py index c6f955d861..4550ca98db 100644 --- a/micromamba/tests/test_list.py +++ b/micromamba/tests/test_list.py @@ -81,17 +81,25 @@ def test_list_no_json( @pytest.mark.parametrize("explicit_flag", ["", "--explicit"]) @pytest.mark.parametrize("md5_flag", ["", "--md5"]) +@pytest.mark.parametrize("canonical_flag", ["", "-c", "--canonical"]) @pytest.mark.parametrize("env_selector", ["", "name", "prefix"]) @pytest.mark.parametrize("shared_pkgs_dirs", [True], indirect=True) -def test_list_explicit( - tmp_home, tmp_root_prefix, tmp_env_name, tmp_xtensor_env, env_selector, explicit_flag, md5_flag +def test_list_subcommands( + tmp_home, + tmp_root_prefix, + tmp_env_name, + tmp_xtensor_env, + env_selector, + explicit_flag, + md5_flag, + canonical_flag, ): if env_selector == "prefix": - res = helpers.umamba_list("-p", tmp_xtensor_env, explicit_flag, md5_flag) + res = helpers.umamba_list("-p", tmp_xtensor_env, explicit_flag, md5_flag, canonical_flag) elif env_selector == "name": - res = helpers.umamba_list("-n", tmp_env_name, explicit_flag, md5_flag) + res = helpers.umamba_list("-n", tmp_env_name, explicit_flag, md5_flag, canonical_flag) else: - res = helpers.umamba_list(explicit_flag, md5_flag) + res = helpers.umamba_list(explicit_flag, md5_flag, canonical_flag) outputs_list = res.strip().split("\n")[2:] if explicit_flag == "--explicit": @@ -101,27 +109,12 @@ def test_list_explicit( assert "#" in output else: assert "#" not in output - - -@pytest.mark.parametrize("canonical_flag", ["", "--canonical"]) -@pytest.mark.parametrize("env_selector", ["", "name", "prefix"]) -@pytest.mark.parametrize("shared_pkgs_dirs", [True], indirect=True) -def test_list_canonical( - tmp_home, tmp_root_prefix, tmp_env_name, tmp_xtensor_env, env_selector, canonical_flag -): - if env_selector == "prefix": - res = helpers.umamba_list("-p", tmp_xtensor_env, canonical_flag) - elif env_selector == "name": - res = helpers.umamba_list("-n", tmp_env_name, canonical_flag) else: - res = helpers.umamba_list(canonical_flag) - - outputs_list = res.strip().split("\n")[2:] - if canonical_flag == "--canonical": - items = ["conda-forge/", "::"] - for output in outputs_list: - assert all(i in output for i in items) - assert " " not in output + if canonical_flag == "--canonical": + items = ["conda-forge/", "::"] + for output in outputs_list: + assert all(i in output for i in items) + assert " " not in output @pytest.mark.parametrize("quiet_flag", ["", "-q", "--quiet"])