Merge branch 'main' into dependabot/pip/importlib-metadata-8.3.0

weaviate · Aug 20, 2024 · f3cedf1 · f3cedf1
2 parents d31426e + 8c3f915
commit f3cedf1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 28 deletions.
diff --git a/integration/test_auth.py b/integration/test_auth.py
@@ -66,14 +66,14 @@ def test_authentication_client_credentials(
 @pytest.mark.parametrize(
     "name,user,env_variable_name,port,scope,warning",
     [
-        (
-            "WCS",
-            "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
-            "WCS_DUMMY_CI_PW",
-            WCS_PORT,
-            None,
-            False,
-        ),
+        # (  # WCS keycloak times out too often
+        #     "WCS",
+        #     "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
+        #     "WCS_DUMMY_CI_PW",
+        #     WCS_PORT,
+        #     None,
+        #     False,
+        # ),
         (
             "okta",
             "test@test.de",
@@ -168,12 +168,12 @@ def _get_access_token(url: str, user: str, pw: str) -> Dict[str, str]:
 @pytest.mark.parametrize(
     "name,user,env_variable_name,port",
     [
-        (
-            "WCS",
-            "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
-            "WCS_DUMMY_CI_PW",
-            WCS_PORT,
-        ),
+        # (  # WCS keycloak times out too often
+        #     "WCS",
+        #     "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
+        #     "WCS_DUMMY_CI_PW",
+        #     WCS_PORT,
+        # ),
         (
             "okta",
             "test@test.de",

diff --git a/integration_v3/test_authentication.py b/integration_v3/test_authentication.py
@@ -89,14 +89,14 @@ def test_authentication_client_credentials(
 @pytest.mark.parametrize(
     "name,user,env_variable_name,port,scope,warning",
     [
-        (
-            "WCS",
-            "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
-            "WCS_DUMMY_CI_PW",
-            WCS_PORT,
-            None,
-            False,
-        ),
+        # (  # WCS keycloak times out too often
+        #     "WCS",
+        #     "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
+        #     "WCS_DUMMY_CI_PW",
+        #     WCS_PORT,
+        #     None,
+        #     False,
+        # ),
         (
             "okta",
             "test@test.de",
@@ -168,12 +168,12 @@ def _get_access_token(url: str, user: str, pw: str) -> Dict[str, str]:
 @pytest.mark.parametrize(
     "name,user,env_variable_name,port",
     [
-        (
-            "WCS",
-            "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
-            "WCS_DUMMY_CI_PW",
-            WCS_PORT,
-        ),
+        # (
+        #     "WCS",
+        #     "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
+        #     "WCS_DUMMY_CI_PW",
+        #     WCS_PORT,
+        # ),
         (
             "okta",
             "test@test.de",
@@ -227,6 +227,8 @@ def test_client_with_authentication_with_anon_weaviate(recwarn):
 def test_bearer_token_without_refresh(recwarn):
     """Test that the client warns users when only supplying an access token without refresh."""
 
+    pytest.skip("WCS keycloak times out too often")
+
     # testing for warnings can be flaky without this as there are open SSL conections
     warnings.filterwarnings(action="ignore", message="unclosed", category=ResourceWarning)
     warnings.filterwarnings(action="ignore", message="Dep005", category=DeprecationWarning)