Sync bitbucket and GitHub

ansible-collections · Apr 12, 2021 · e219242 · e219242
1 parent 4841461
commit e219242
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/tests/unit/compat/unittest.py b/tests/unit/compat/unittest.py
@@ -25,6 +25,8 @@
 
 import sys
 
+import pytest
+
 # Allow wildcard import because we really do want to import all of
 # unittests's symbols into this compat shim
 # pylint: disable=wildcard-import,unused-wildcard-import
@@ -34,5 +36,9 @@
         from unittest2 import *
     except ImportError:
         print('You need unittest2 installed on python2.6.x to run tests')
+
+        class TestCase:
+            """ skip everything """
+            pytestmark = pytest.mark.skip('Skipping Unit Tests on 2.6 as unittest2 may not be available')
 else:
     from unittest import *
diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt
@@ -1,2 +1 @@
-solidfire-sdk-python
-unittest2 ; python_version < '2.7'
+solidfire-sdk-python ; python_version >= '2.7'