tests: simplify run_command

Author: elopez

tests/conftest.py

@@ -99,43 +99,35 @@ def run_in_venv(
         raise
 
 
-@pytest.fixture(scope="function")
-def run_command():
+def run_command(
+    cmd: str, check: bool = True, capture_stderr: bool = True
+) -> subprocess.CompletedProcess:
     """
     Execute shell commands and return output.
 
-    This fixture is kept for backward compatibility with tests using isolated_solc_data.
+    This function is kept for backward compatibility with tests using isolated_solc_data.
     For tests using isolated_python_env, use run_in_venv instead.
-    """
 
-    def _run(
-        cmd: str, check: bool = True, capture_stderr: bool = True
-    ) -> subprocess.CompletedProcess:
-        """
-        Run a shell command and return the result.
-
-        Args:
-            cmd: Command to run
-            check: Whether to raise on non-zero exit code
-            capture_stderr: Whether to capture stderr
-
-        Returns:
-            CompletedProcess instance with stdout, stderr, and returncode
-        """
-        stderr_setting = subprocess.STDOUT if capture_stderr else subprocess.PIPE
-
-        result = subprocess.run(
-            cmd,
-            shell=True,
-            capture_output=False,
-            stdout=subprocess.PIPE,
-            stderr=stderr_setting,
-            text=True,
-            check=check,
-        )
-        return result
+    Args:
+        cmd: Command to run
+        check: Whether to raise on non-zero exit code
+        capture_stderr: Whether to capture stderr
 
-    return _run
+    Returns:
+        CompletedProcess instance with stdout, stderr, and returncode
+    """
+    stderr_setting = subprocess.STDOUT if capture_stderr else subprocess.PIPE
+
+    result = subprocess.run(
+        cmd,
+        shell=True,
+        capture_output=False,
+        stdout=subprocess.PIPE,
+        stderr=stderr_setting,
+        text=True,
+        check=check,
+    )
+    return result
 
 
 @pytest.fixture(scope="session")
@@ -144,21 +136,6 @@ def test_contracts_dir() -> Path:
     return Path(__file__).parent.parent / "scripts" / "solidity_tests"
 
 
-@pytest.fixture(scope="session", autouse=True)
-def ensure_solc_select_installed():
-    """
-    Ensure solc-select is installed in development mode.
-
-    This runs once per test session to ensure the current
-    development version is being tested.
-    """
-    # Check if solc-select is available
-    result = subprocess.run(["solc-select", "--help"], capture_output=True, text=True, check=False)
-
-    if result.returncode != 0:
-        pytest.exit("solc-select is not installed. Please run: pip install -e .")
-
-
 # Platform markers for conditional test execution
 def pytest_configure(config):
     """Register custom markers."""

tests/test_compiler_versions.py

@@ -5,11 +5,13 @@
 exactly mirroring the behavior of the original test_solc.sh script.
 """
 
+from .conftest import run_command
+
 
 class TestCompilerVersions:
     """Test compilation with different Solidity compiler versions."""
 
-    def test_solc_045(self, run_command, test_contracts_dir, isolated_solc_data):
+    def test_solc_045(self, test_contracts_dir, isolated_solc_data):
         """Test Solidity 0.4.5 compilation behavior."""
         # Switch to 0.4.5
         result = run_command("solc-select use 0.4.5 --always-install", check=False)
@@ -26,7 +28,7 @@ def test_solc_045(self, run_command, test_contracts_dir, isolated_solc_data):
             f"solc045_fail_compile did not fail as expected. Output: {result.stdout}"
         )
 
-    def test_solc_050(self, run_command, test_contracts_dir, isolated_solc_data):
+    def test_solc_050(self, test_contracts_dir, isolated_solc_data):
         """Test Solidity 0.5.0 compilation behavior."""
         # Switch to 0.5.0
         result = run_command("solc-select use 0.5.0 --always-install", check=False)
@@ -44,7 +46,7 @@ def test_solc_050(self, run_command, test_contracts_dir, isolated_solc_data):
             in result.stdout
         ), f"solc050_fail_compile did not fail as expected. Output: {result.stdout}"
 
-    def test_solc_060(self, run_command, test_contracts_dir, isolated_solc_data):
+    def test_solc_060(self, test_contracts_dir, isolated_solc_data):
         """Test Solidity 0.6.0 compilation behavior."""
         # Switch to 0.6.0
         result = run_command("solc-select use 0.6.0 --always-install", check=False)
@@ -58,7 +60,7 @@ def test_solc_060(self, run_command, test_contracts_dir, isolated_solc_data):
         result = run_command(f"solc {test_contracts_dir}/solc060_success_receive.sol", check=False)
         assert result.returncode == 0, f"solc060_success_receive failed with: {result.stdout}"
 
-    def test_solc_070(self, run_command, test_contracts_dir, isolated_solc_data):
+    def test_solc_070(self, test_contracts_dir, isolated_solc_data):
         """Test Solidity 0.7.0 compilation behavior."""
         # Switch to 0.7.0
         result = run_command("solc-select use 0.7.0 --always-install", check=False)
@@ -75,7 +77,7 @@ def test_solc_070(self, run_command, test_contracts_dir, isolated_solc_data):
         result = run_command(f"solc {test_contracts_dir}/solc070_success.sol", check=False)
         assert result.returncode == 0, f"solc070_success failed with: {result.stdout}"
 
-    def test_solc_080(self, run_command, test_contracts_dir, isolated_solc_data):
+    def test_solc_080(self, test_contracts_dir, isolated_solc_data):
         """Test Solidity 0.8.0 compilation behavior."""
         # Switch to 0.8.0
         result = run_command("solc-select use 0.8.0 --always-install", check=False)
@@ -104,7 +106,7 @@ def test_solc_080(self, run_command, test_contracts_dir, isolated_solc_data):
 class TestVersionSwitching:
     """Test version switching functionality."""
 
-    def test_always_install_flag(self, run_command, isolated_solc_data):
+    def test_always_install_flag(self, isolated_solc_data):
         """Test --always-install flag functionality."""
         # In isolated environment, 0.8.9 won't be installed initially
         # No need for complex path validation or manual cleanup
@@ -116,7 +118,7 @@ def test_always_install_flag(self, run_command, isolated_solc_data):
             f"Failed to switch with --always-install. Output: {result.stdout}"
         )
 
-    def test_use_without_install(self, run_command, isolated_solc_data):
+    def test_use_without_install(self, isolated_solc_data):
         """Test that 'use' fails when version is not installed."""
         # In isolated environment, 0.8.1 won't be installed initially
         # No need for complex cleanup logic

tests/test_platform_specific.py

@@ -9,6 +9,8 @@
 
 import pytest
 
+from .conftest import run_command
+
 # Platform configuration matrix
 PLATFORM_CONFIGS = {
     "linux": {
@@ -42,7 +44,7 @@ class TestPlatformSpecific:  # pylint: disable=too-few-public-methods
             ),
         ],
     )
-    def test_version_boundaries(self, platform, config, run_command, isolated_solc_data):
+    def test_version_boundaries(self, platform, config, isolated_solc_data):
         """Test version boundaries and constraints for all platforms."""
 
         min_version = config["min_version"]