Skip when environment does not support activation test

Signed-off-by: Bernat Gabor <[email protected]>

Author: gaborbernat

tests/unit/activation/conftest.py

@@ -14,7 +14,8 @@
 
 
 class ActivationTester(object):
-    def __init__(self, session, cmd, activate_script, extension):
+    def __init__(self, of_class, session, cmd, activate_script, extension):
+        self.of_class = of_class
         self._creator = session.creator
         self.cmd = cmd
         self._version_cmd = [cmd, "--version"]
@@ -128,8 +129,8 @@ def norm_path(path):
 
 
 class RaiseOnNonSourceCall(ActivationTester):
-    def __init__(self, session, cmd, activate_script, extension, non_source_fail_message):
-        super(RaiseOnNonSourceCall, self).__init__(session, cmd, activate_script, extension)
+    def __init__(self, of_class, session, cmd, activate_script, extension, non_source_fail_message):
+        super(RaiseOnNonSourceCall, self).__init__(of_class, session, cmd, activate_script, extension)
         self.non_source_fail_message = non_source_fail_message
 
     def __call__(self, monkeypatch, tmp_path):
@@ -172,6 +173,8 @@ def activation_python(tmp_path_factory):
 def activation_tester(activation_python, monkeypatch, tmp_path):
     def _tester(tester_class):
         tester = tester_class(activation_python)
+        if not tester.of_class.supports(activation_python.creator.interpreter):
+            pytest.skip("{} not supported on current environment".format(tester.of_class.__name__))
         version = tester.get_version(raise_on_fail=IS_INSIDE_CI)
         if not isinstance(version, six.string_types):
             pytest.skip(msg=six.text_type(version))

tests/unit/activation/test_bash.py

@@ -1,9 +1,13 @@
 from __future__ import absolute_import, unicode_literals
 
+from virtualenv.activation import BashActivator
+
 
 def test_bash(raise_on_non_source_class, activation_tester):
     class Bash(raise_on_non_source_class):
         def __init__(self, session):
-            super(Bash, self).__init__(session, "bash", "activate.sh", "sh", "You must source this script: $ source ")
+            super(Bash, self).__init__(
+                BashActivator, session, "bash", "activate.sh", "sh", "You must source this script: $ source "
+            )
 
     activation_tester(Bash)

tests/unit/activation/test_csh.py

@@ -1,9 +1,11 @@
 from __future__ import absolute_import, unicode_literals
 
+from virtualenv.activation import CShellActivator
+
 
 def test_csh(activation_tester_class, activation_tester):
     class Csh(activation_tester_class):
         def __init__(self, session):
-            super(Csh, self).__init__(session, "csh", "activate.csh", "csh")
+            super(Csh, self).__init__(CShellActivator, session, "csh", "activate.csh", "csh")
 
     activation_tester(Csh)

tests/unit/activation/test_dos.py

@@ -2,14 +2,16 @@
 
 import pipes
 
+from virtualenv.activation import BatchActivator
+
 
 def test_batch(activation_tester_class, activation_tester, tmp_path, activation_python):
     version_script = tmp_path / "version.bat"
     version_script.write_text("ver")
 
     class Batch(activation_tester_class):
         def __init__(self, session):
-            super(Batch, self).__init__(session, None, "activate.bat", "bat")
+            super(Batch, self).__init__(BatchActivator, session, None, "activate.bat", "bat")
             self._version_cmd = [str(version_script)]
             self._invoke_script = []
             self.deactivate = "call {}".format(self.quote(str(activation_python.creator.bin_dir / "deactivate.bat")))

tests/unit/activation/test_fish.py

@@ -1,9 +1,11 @@
 from __future__ import absolute_import, unicode_literals
 
+from virtualenv.activation import FishActivator
+
 
 def test_csh(activation_tester_class, activation_tester):
     class Fish(activation_tester_class):
         def __init__(self, session):
-            super(Fish, self).__init__(session, "fish", "activate.fish", "fish")
+            super(Fish, self).__init__(FishActivator, session, "fish", "activate.fish", "fish")
 
     activation_tester(Fish)

tests/unit/activation/test_powershell.py

@@ -3,12 +3,14 @@
 import pipes
 import sys
 
+from virtualenv.activation import PowerShellActivator
+
 
 def test_powershell(activation_tester_class, activation_tester):
     class PowerShell(activation_tester_class):
         def __init__(self, session):
             cmd = "powershell.exe" if sys.platform == "win32" else "pwsh"
-            super(PowerShell, self).__init__(session, cmd, "activate.ps1", "ps1")
+            super(PowerShell, self).__init__(PowerShellActivator, session, cmd, "activate.ps1", "ps1")
             self._version_cmd = [self.cmd, "-c", "$PSVersionTable"]
             self.activate_cmd = "."
 

tests/unit/activation/test_python_activator.py

@@ -4,11 +4,14 @@
 import os
 import sys
 
+from virtualenv.activation import PythonActivator
+
 
 def test_python(raise_on_non_source_class, activation_tester):
     class Python(raise_on_non_source_class):
         def __init__(self, session):
             super(Python, self).__init__(
+                PythonActivator,
                 session,
                 sys.executable,
                 activate_script="activate_this.py",

tests/unit/activation/test_xonosh.py

@@ -2,11 +2,13 @@
 
 import sys
 
+from virtualenv.activation import XonoshActivator
+
 
 def test_xonosh(activation_tester_class, activation_tester):
     class Xonosh(activation_tester_class):
         def __init__(self, session):
-            super(Xonosh, self).__init__(session, "xonsh", "activate.xsh", "xsh")
+            super(Xonosh, self).__init__(XonoshActivator, session, "xonsh", "activate.xsh", "xsh")
             self._invoke_script = [sys.executable, "-m", "xonsh"]
             self.__version_cmd = [sys.executable, "-m", "xonsh", "--version"]