Minor tweaks to aid in local integration testing

DIAGNijmegen · Jan 14, 2025 · 44c884e · 44c884e
1 parent b606be8
commit 44c884e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/gcapi/client.py b/gcapi/client.py
@@ -418,7 +418,7 @@ def __init__(
         self._auth_header = _generate_auth_header(token=token)
 
         self.base_url = URL(base_url)
-        if self.base_url.scheme.lower() != "https":
+        if verify and self.base_url.scheme.lower() != "https":
             raise RuntimeError("Base URL must be https")
 
         self._api_meta = ApiDefinitions()
@@ -439,7 +439,10 @@ def __getattr__(self, item):
     def validate_url(self, url):
         url = URL(url)
 
-        if not url.scheme == "https" or url.netloc != self.base_url.netloc:
+        if (
+            url.scheme.lower() != self.base_url.scheme.lower()
+            or url.netloc != self.base_url.netloc
+        ):
             raise RuntimeError(f"Invalid target URL: {url}")
 
     def __call__(

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -22,14 +22,18 @@ def anyio_backend():
 
 @pytest.fixture(scope="session")
 def local_grand_challenge() -> Generator[str, None, None]:
-    local_api_url = "https://gc.localhost/api/v1/"
+    local_api_url = os.environ.get(
+        "LOCAL_API_URL",
+        "https://gc.localhost/api/v1/",
+    )
 
     try:
         r = httpx.get(
             local_api_url,
             verify=False,
             headers={"Authorization": f"Bearer {ADMIN_TOKEN}"},
         )
+
         r.raise_for_status()
         local_gc_running = True
     except httpx.HTTPError: