TST: Cleanup and clarify pypy tests

airspeed-velocity · Dec 2, 2024 · fc0415c · fc0415c
1 parent 893e5a1
commit fc0415c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 26 deletions.
diff --git a/test/test_environment_bench.py b/test/test_environment_bench.py
@@ -4,6 +4,8 @@
 
 import pytest
 
+from asv import util
+
 from . import tools
 
 ENVIRONMENTS = []
@@ -116,6 +118,8 @@ def test_asv_benchmark(asv_project_factory, env):
     """
     Test running ASV benchmarks in the specified environment.
     """
+    if util.IS_PYPY and env in ["rattler", "mamba"]:
+        pytest.skip("mamba and py-rattler only work for CPython")
     project_dir = asv_project_factory(custom_config={})
     subprocess.run(["asv", "machine", "--yes"], cwd=project_dir, check=True)
     result = subprocess.run(
@@ -175,6 +179,8 @@ def test_asv_mamba(
     Test running ASV benchmarks with various configurations,
     checking for specific errors when failures are expected.
     """
+    if util.IS_PYPY:
+        pytest.skip("mamba and py-rattler only work for CPython")
     project_dir = asv_project_factory(custom_config=config_modifier)
     try:
         subprocess.run(

diff --git a/test/test_profile.py b/test/test_profile.py
@@ -23,6 +23,10 @@ def test_profile_python_same(capsys, basic_conf):
     assert "Installing" not in text
 
 
+@pytest.mark.skipif(
+    util.IS_PYPY,
+    reason="pypy doesn't support profiles",
+)
 def test_profile_python_commit(capsys, basic_conf):
 
     tmpdir, local, conf, machine_file = basic_conf
@@ -35,31 +39,18 @@ def test_profile_python_commit(capsys, basic_conf):
     assert "Installing" in text
 
     # Query the previous empty results results; there should be no issues here
-    if not util.ON_PYPY:
-        tools.run_asv_with_conf(conf, 'profile', "time_secondary.track_value",
-                                f'{util.git_default_branch()}', _machine_file=machine_file)
-        text, err = capsys.readouterr()
-
-        assert "Profile data does not already exist" in text
-
-        tools.run_asv_with_conf(conf, 'run', "--profile",
-                                "--bench=time_secondary.track_value",
-                                f'{util.git_default_branch()}^!', _machine_file=machine_file)
-    else:
-        # The ASV main process doesn't use PyPy
-        with pytest.raises(util.UserError):
-            tools.run_asv_with_conf(conf, 'profile', "time_secondary.track_value",
-                                    f'{util.git_default_branch()}', _machine_file=machine_file)
+    tools.run_asv_with_conf(conf, 'profile', "time_secondary.track_value",
+                            f'{util.git_default_branch()}', _machine_file=machine_file)
+    text, err = capsys.readouterr()
+
+    assert "Profile data does not already exist" in text
 
+    tools.run_asv_with_conf(conf, 'run', "--profile",
+                            "--bench=time_secondary.track_value",
+                            f'{util.git_default_branch()}^!', _machine_file=machine_file)
     # Profile results should be present now
-    if not util.ON_PYPY:
-        tools.run_asv_with_conf(conf, 'profile', "time_secondary.track_value",
-                                f'{util.git_default_branch()}', _machine_file=machine_file)
-        text, err = capsys.readouterr()
-
-        assert "Profile data does not already exist" not in text
-    else:
-        # The ASV main process doesn't use PyPy
-        with pytest.raises(util.UserError):
-            tools.run_asv_with_conf(conf, 'profile', "time_secondary.track_value",
-                                    f'{util.git_default_branch()}', _machine_file=machine_file)
+    tools.run_asv_with_conf(conf, 'profile', "time_secondary.track_value",
+                            f'{util.git_default_branch()}', _machine_file=machine_file)
+    text, err = capsys.readouterr()
+
+    assert "Profile data does not already exist" not in text