update Pipfile

Author: Martin Kudlej

Pipfile

@@ -3,11 +3,11 @@ flake8 = "*"
 mypy = "*"
 pylint = "*"
 black = "*"
-pytest = "<8.0.0"
+pytest = "*"
 python-dotenv = "*"
 backoff = "*"
 python-language-server = "*"
-pyls-mypy = "*"
+#pyls-mypy = "*"
 pyls-isort = "*"
 pytest-order = "*"
 

tests/integration/conftest.py

@@ -2,7 +2,6 @@
 import secrets
 import random
 import string
-from distutils.util import strtobool
 
 import pytest
 from dotenv import load_dotenv
@@ -30,15 +29,15 @@
 
 load_dotenv()
 
+def strtobool(istr):
+    return istr == "y" or istr == "yes" or istr == "t" or istr == "true" or istr == "1"
+
 
 def cleanup(resource):
     resource.delete()
     assert not resource.exists()
 
 
-#    pass
-
-
 def get_suffix() -> str:
     return secrets.token_urlsafe(8)
 
@@ -66,7 +65,7 @@ def master_token() -> str:
 @pytest.fixture(scope="session")
 def ssl_verify() -> bool:
     ssl_verify = os.getenv("THREESCALE_SSL_VERIFY", "false")
-    ssl_verify = bool(strtobool(ssl_verify))
+    ssl_verify = strtobool(ssl_verify)
     if not ssl_verify:
         import urllib3
 

tests/test_3scale_api_client.py

@@ -29,15 +29,15 @@ def _create_client(
 
 
 @pytest.fixture()
-def api(url, token, ocp_provider_ref):
+def api(url, token, ocp_provider_ref, namespace):
     return _create_client(url, token, ocp_provider_ref)
 
 
 @pytest.fixture()
 def namespace():
     try:
         return ocp.get_project_name()
-    except OpenShiftPythonException:
+    except (FileNotFoundError, OpenShiftPythonException):
         return "NOT LOGGED IN"