Amend test suite for compatibility with libmamba v2

conda/testing/solver_helpers.py

@@ -8,6 +8,7 @@
 import functools
 import json
 import pathlib
+import time
 from tempfile import TemporaryDirectory
 
 import pytest
@@ -707,6 +708,9 @@ def test_nonexistent_deps(self, env):
             "test::pip-1.3.1-py33_1",
         }
 
+        # Add 1s to make sure the new repodata.jsons have different mod times
+        time.sleep(1)
+
         # This time, the latest version is messed up
         env.repo_packages = index_packages(1) + [
             helpers.record(

tests/core/test_solve.py

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 import copy
 import os
+import re
 import sys
 from pprint import pprint
 from unittest.mock import Mock, patch
@@ -2692,6 +2693,14 @@ def test_timestamps_1(tmpdir):
 
 
 def test_channel_priority_churn_minimized(tmpdir):
+    """
+    get_solver_aggregate_2 has [channel-4, channel-2].
+    When the channels are reverted in the second operation, we put
+    channel-2 first. Under these circumstances, reinstalling
+    'itsdangerous' should pick the noarch version from channel-2
+    instead of the non-noarch variant in channel-4. Everything
+    else should stay the same due to FREEZE_INSTALLED.
+    """
     specs = (
         MatchSpec("conda-build"),
         MatchSpec("itsdangerous"),
@@ -2701,6 +2710,12 @@ def test_channel_priority_churn_minimized(tmpdir):
 
     pprint(convert_to_dist_str(final_state))
 
+    if context.solver == "libmamba":
+        # With libmamba v2, we need this extra flag to make this test pass
+        # Otherwise, the solver considers the current state as satisfying.
+        solver_kwargs = {"force_reinstall": True}
+    else:
+        solver_kwargs = {}
     with get_solver_aggregate_2(
         tmpdir,
         [MatchSpec("itsdangerous")],
@@ -2709,7 +2724,8 @@ def test_channel_priority_churn_minimized(tmpdir):
     ) as solver:
         solver.channels.reverse()
         unlink_dists, link_dists = solver.solve_for_diff(
-            update_modifier=UpdateModifier.FREEZE_INSTALLED
+            update_modifier=UpdateModifier.FREEZE_INSTALLED,
+            **solver_kwargs,
         )
         pprint(convert_to_dist_str(unlink_dists))
         pprint(convert_to_dist_str(link_dists))
@@ -3076,9 +3092,7 @@ def test_freeze_deps_1(tmpdir):
             (
                 "channel-2::six-1.7.3-py34_0",
                 "channel-2::python-3.4.5-0",
-                # LIBMAMBA ADJUSTMENT
-                # libmamba doesn't remove xz in this solve
-                *(() if context.solver == "libmamba" else ("channel-2::xz-5.2.3-0",)),
+                "channel-2::xz-5.2.3-0",
             )
         )
         link_order = add_subdir_to_iter(
@@ -3282,12 +3296,12 @@ def test_downgrade_python_prevented_with_sane_message(tmpdir):
             error_snippets = [
                 "Encountered problems while solving",
                 "Pins seem to be involved in the conflict. Currently pinned specs",
-                "python 2.6.*",
-                "scikit-learn 0.13",
+                r"python.*2\.6",
+                r"scikit-learn.*0\.13",
             ]
 
         for snippet in error_snippets:
-            assert snippet in error_msg
+            assert re.search(snippet, error_msg)
 
     specs_to_add = (MatchSpec("unsatisfiable-with-py26"),)
     with get_solver(
@@ -3310,12 +3324,12 @@ def test_downgrade_python_prevented_with_sane_message(tmpdir):
             error_snippets = [
                 "Encountered problems while solving",
                 "Pins seem to be involved in the conflict. Currently pinned specs",
-                "python 2.6.*",
+                r"python.*2\.6",
                 "unsatisfiable-with-py26",
             ]
 
         for snippet in error_snippets:
-            assert snippet in error_msg
+            assert re.search(snippet, error_msg)
 
 
 fake_index = [

tests/test_activate.py

@@ -124,7 +124,7 @@ def bash_unsupported() -> str | None:
 
 
 skip_unsupported_bash = pytest.mark.skipif(
-    bash_unsupported(),
+    bool(bash_unsupported()),
     reason=bash_unsupported() or "bash: supported!",
 )
 skip_unsupported_posix_path = pytest.mark.skipif(