#265 fix typehints in tests (#266)

ckunki · web-flow · commit b616c30384bf · 2025-09-29T14:09:55.000+02:00
* Fixed type hints in tests * Re-enabled SaaS Tests Fixing #251 * Added free disk space to saas integration tests
diff --git a/.github/workflows/merge-gate.yml b/.github/workflows/merge-gate.yml
@@ -33,15 +33,13 @@ jobs:
     permissions:
       contents: read
 
-# Deactivated because SaaS Tests are broken because of breaking API changes in SaaS Rest API
-# See https://github.com/exasol/notebook-connector/issues/251
-#  saas-tests:
-#    name: SaaS
-#    needs: [ run-slow-tests ]
-#    uses: ./.github/workflows/tests-saas.yml
-#    secrets: inherit
-#    permissions:
-#      contents: read
+  saas-tests:
+    name: SaaS
+    needs: [ run-slow-tests ]
+    uses: ./.github/workflows/tests-saas.yml
+    secrets: inherit
+    permissions:
+      contents: read
 
   large-runner-tests:
     name: Large Runner
diff --git a/.github/workflows/tests-saas.yml b/.github/workflows/tests-saas.yml
@@ -17,6 +17,21 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Free disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+          large-packages: false
+
+      - name: Free disk space by removing large directories
+        run: |
+          sudo rm -rf /usr/local/graalvm/
+          sudo rm -rf /usr/local/.ghcup/
+          sudo rm -rf /usr/local/share/powershell
+          sudo rm -rf /usr/local/share/chromium
+          sudo rm -rf /usr/local/lib/node_modules
+          sudo rm -rf /opt/ghc
+
       - name: Setup Python & Poetry Environment
         uses: exasol/python-toolbox/.github/actions/python-environment@v1
 
diff --git a/doc/changes/unreleased.md b/doc/changes/unreleased.md
@@ -12,3 +12,5 @@ This release marks most of the NC's dependencies in file `pyproject.toml` as _op
 
 * #253: Made dependencies optional in file `pyproject.toml`
 * #260: Added unit tests for CLI param wrappers
+* #265: Fixed type hints in tests
+* #251: Re-enabled SaaS integration tests
diff --git a/exasol/nb_connector/bfs_utils.py b/exasol/nb_connector/bfs_utils.py
@@ -27,7 +27,7 @@ def _file_in_bucket(file_name: str, bucket: bfs.Bucket) -> bool:
 
 
 def put_file(
-    bucket: bfs.Bucket, file_path: pathlib.Path, skip_if_exists: bool = True
+    bucket: bfs.BucketLike, file_path: pathlib.Path, skip_if_exists: bool = True
 ) -> bfs.path.BucketPath:
     """
     Uploads given file into bucketfs
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -127,7 +127,6 @@ ignore_missing_imports = true
 [[tool.mypy.overrides]]
 module = [
     "exasol/nb_connector/extension_wrapper_common",
-    "test.*",
     # not yet include py.typed
     "docker.*",
     "ibis.*",
diff --git a/test/integration/ordinary/itde_mgr_in_container/conftest.py b/test/integration/ordinary/itde_mgr_in_container/conftest.py
@@ -2,6 +2,7 @@
 import logging
 import subprocess
 import textwrap
+from collections.abc import Iterator
 from inspect import cleandoc
 from pathlib import Path
 
@@ -54,7 +55,7 @@ def dockerfile_content() -> str:
 
 
 @pytest.fixture
-def docker_image(dockerfile_content) -> Image:
+def docker_image(dockerfile_content) -> Iterator[Image]:
     with ContextDockerClient() as client:
         image, _ = client.images.build(
             fileobj=io.BytesIO(dockerfile_content.encode("UTF-8"))
diff --git a/test/integration/ordinary/test_sagemaker_extension_wrapper.py b/test/integration/ordinary/test_sagemaker_extension_wrapper.py
@@ -38,5 +38,5 @@ def test_initialize_sme_extension(secrets: Secrets, setup_itde):
             assert script_counts["SCRIPTING"] >= 4
             assert script_counts["UDF"] >= 5
             assert_connection_exists(
-                secrets.get(CKey.sme_aws_connection), pyexasol_connection
+                secrets[CKey.sme_aws_connection], pyexasol_connection
             )
diff --git a/test/integration/ordinary/test_transformers_extension_wrapper.py b/test/integration/ordinary/test_transformers_extension_wrapper.py
@@ -32,8 +32,8 @@ def test_initialize_te_extension(secrets: Secrets, setup_itde):
             script_counts = get_script_counts(pyexasol_connection, secrets)
             assert script_counts["UDF"] > 5
             assert_connection_exists(
-                secrets.get(CKey.bfs_connection_name), pyexasol_connection
+                secrets[CKey.bfs_connection_name], pyexasol_connection
             )
             assert_connection_exists(
-                secrets.get(CKey.te_hf_connection), pyexasol_connection
+                secrets[CKey.te_hf_connection], pyexasol_connection
             )
diff --git a/test/integration/saas_instance/test_cloud_storage.py b/test/integration/saas_instance/test_cloud_storage.py
@@ -36,4 +36,4 @@ def test_saas_bucket_can_be_iterated(backend, secrets: Secrets, setup_itde):
     bucket = open_bucketfs_bucket(secrets)
     NAME = "temp-file.dat"
     bucket.upload(NAME, b"some data")
-    assert NAME in list(bucket)
+    assert NAME in bucket.files
diff --git a/test/unit/cli/scs_mock.py b/test/unit/cli/scs_mock.py
@@ -13,7 +13,7 @@ def __init__(
         backend: StorageBackend | None = None,
         use_itde: bool | None = None,
     ):
-        self._dict = dict()
+        self._dict: dict[str, str] = {}
         if backend:
             self.save(CKey.storage_backend, backend.name)
         if use_itde is not None:
diff --git a/test/unit/cli/test_param_wrappers.py b/test/unit/cli/test_param_wrappers.py
@@ -2,6 +2,7 @@
 import itertools
 import os
 from test.unit.cli.scs_mock import ScsMock
+from typing import Any
 from unittest.mock import Mock
 
 import click
@@ -16,7 +17,7 @@
 )
 
 
-def select_atts(obj: any, atts: dict[str, any]) -> dict[str, any]:
+def select_atts(obj: Any, atts: dict[str, Any]) -> dict[str, Any]:
     return {k: getattr(obj, k) for k in atts}
 
 
diff --git a/test/unit/slc/utest_slc.py b/test/unit/slc/utest_slc.py
@@ -1,5 +1,6 @@
 import contextlib
 import json
+from collections.abc import Generator
 from pathlib import Path
 from test.unit.slc.util import (
     SecretsMock,
@@ -152,7 +153,9 @@ def test_legal_names(name, slc_factory):
 
 
 @pytest.fixture
-def slc_with_tmp_checkout_dir(sample_slc_name, slc_factory) -> ScriptLanguageContainer:
+def slc_with_tmp_checkout_dir(
+    sample_slc_name, slc_factory
+) -> Generator[ScriptLanguageContainer, None, None]:
     with slc_factory.context(slc_name=sample_slc_name, flavor="Vanilla") as slc:
         yield slc
 
diff --git a/test/unit/slc/util.py b/test/unit/slc/util.py
@@ -5,29 +5,37 @@
 import pytest
 from exasol.slc.models.compression_strategy import CompressionStrategy
 
+from exasol.nb_connector.ai_lab_config import AILabConfig as CKey
 from exasol.nb_connector.secret_store import Secrets
 from exasol.nb_connector.slc.slc_compression_strategy import SlcCompressionStrategy
 from exasol.nb_connector.slc.slc_flavor import SlcFlavor
 
 
+def _ensure_str(key: str | CKey) -> str:
+    return key.name if isinstance(key, CKey) else key
+
+
 class SecretsMock(Secrets):
     def __init__(
         self,
         slc_name: str,
     ):
         self.slc_name = slc_name
-        self._mock = {}
+        self._mock: dict[str, str] = {}
 
-    def get(self, key: str) -> str:
+    def get(self, key: str | CKey, default_value: str | None = None) -> str | None:
+        key = _ensure_str(key)
         return self._mock.get(key)
 
-    def __getitem__(self, key: str) -> str:
+    def __getitem__(self, key: str | CKey) -> str:
+        key = _ensure_str(key)
         val = self._mock.get(key)
         if val is None:
             raise AttributeError(f'Unknown key "{key}"')
         return val
 
-    def save(self, key: str, value: str) -> Secrets:
+    def save(self, key: str | CKey, value: str) -> Secrets:
+        key = _ensure_str(key)
         self._mock[key] = value
         return self
 
diff --git a/test/unit/test_itde_manager.py b/test/unit/test_itde_manager.py
@@ -1,4 +1,5 @@
 import logging
+from collections.abc import Generator
 from unittest import mock
 
 import pytest
@@ -47,7 +48,7 @@ def env_info() -> EnvironmentInfo:
 
 
 @pytest.fixture
-def db_image_version(monkeypatch) -> str:
+def db_image_version(monkeypatch) -> Generator[str, None, None]:
     mocked_db_version = "8.31.0"
     monkeypatch.setenv(TEST_DB_VERSION_ENV_VAR, mocked_db_version)
     yield mocked_db_version
diff --git a/test/utils/integration_test_utils.py b/test/utils/integration_test_utils.py
@@ -2,7 +2,10 @@
 
 import contextlib
 import textwrap
-from collections.abc import Iterator
+from collections.abc import (
+    Generator,
+    Iterator,
+)
 from contextlib import contextmanager
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -105,7 +108,8 @@ def get_script_counts(
     result = pyexasol_connection.execute(
         f"""
             SELECT SCRIPT_TYPE, COUNT(*) FROM SYS.EXA_ALL_SCRIPTS
-            WHERE SCRIPT_SCHEMA='{secrets.get(AILabConfig.db_schema).upper()}' GROUP BY SCRIPT_TYPE;
+            WHERE SCRIPT_SCHEMA='{secrets[AILabConfig.db_schema].upper()}'
+            GROUP BY SCRIPT_TYPE;
         """
     ).fetchall()
     return dict(result)
@@ -130,7 +134,7 @@ def assert_connection_exists(
 @contextmanager
 def language_definition_context(
     pyexasol_connection: ExaConnection, language_alias: str | None = None
-) -> None:
+) -> Generator[None, None, None]:
     """
     A context manager that preserves the current language definitions at both
     SESSION and SYSTEM levels. Optionally creates a definition for the specified

Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,5 @@ def test_initialize_sme_extension(secrets: Secrets, setup_itde):`
`38`	`38`	`assert script_counts["SCRIPTING"] >= 4`
`39`	`39`	`assert script_counts["UDF"] >= 5`
`40`	`40`	`assert_connection_exists(`
`41`		`- secrets.get(CKey.sme_aws_connection), pyexasol_connection`
	`41`	`+ secrets[CKey.sme_aws_connection], pyexasol_connection`
`42`	`42`	`)`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ def test_initialize_te_extension(secrets: Secrets, setup_itde):`
`32`	`32`	`script_counts = get_script_counts(pyexasol_connection, secrets)`
`33`	`33`	`assert script_counts["UDF"] > 5`
`34`	`34`	`assert_connection_exists(`
`35`		`- secrets.get(CKey.bfs_connection_name), pyexasol_connection`
	`35`	`+ secrets[CKey.bfs_connection_name], pyexasol_connection`
`36`	`36`	`)`
`37`	`37`	`assert_connection_exists(`
`38`		`- secrets.get(CKey.te_hf_connection), pyexasol_connection`
	`38`	`+ secrets[CKey.te_hf_connection], pyexasol_connection`
`39`	`39`	`)`