#58 Made the pytest-slc plugin using the pyexasol_connection

justfile

@@ -1,4 +1,4 @@
-PROJECTS := "pytest-extension pytest-slc pytest-backend pytest-saas pytest-itde"
+PROJECTS := "pytest-slc pytest-extension pytest-backend pytest-saas pytest-itde"
 
 # Default target
 default:

pytest-slc/README.md

@@ -14,8 +14,32 @@ pip install pytest-exasol-slc
 
 ## Usage in Tests
 
-Below is an example of a test that requires a script language container to be built and uploaded into the database.
-Note, that by default this test will run twice - once for each backend.
+Below is an example of a test that requires a script language container to be built and deployed in the database.
+Here, we override the default `language_alias` fixture providing a "meaningful" name. The language container will be
+activated with this language alias. Note, that by default the test will run twice - once for each backend.
+
+```python
+import pytest
+
+@pytest.fixture(scope='session')
+def language_alias():
+    return "MY_LANGUAGE_ALIAS"
+
+@pytest.fixture(scope='session')
+def slc_builder(use_onprem, use_saas):
+    if use_onprem or use_saas:
+        with language_container_factory() as container_builder:
+            yield container_builder
+    else:
+        yield None
+
+def test_something_with_slc(deployed_slc):
+    ...
+```
+
+Alternatively, the language container can be deployed using the function version of this fixture. The function
+can be called multiple times providing an opportunity to activate the language container with different
+aliases.
 
 ```python
 import pytest
@@ -28,6 +52,7 @@ def slc_builder(use_onprem, use_saas):
     else:
         yield None
 
-def test_something_with_slc(upload_slc):
+def test_something_with_slc(deploy_slc):
+    deploy_slc("MY_LANGUAGE_ALIAS")
     ...
 ```

pytest-slc/doc/changes/changes_0.3.0.md

@@ -1,4 +1,4 @@
-# 0.3.0 - 2024-09-20
+# 0.3.0 - 2024-09-23
 
 ## Summary
 

pytest-slc/exasol/pytest_slc/__init__.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
 from pathlib import Path
+import getpass
 from exasol.pytest_backend import paralleltask
 import pytest
 
 import exasol.bucketfs as bfs
-from exasol.python_extension_common.deployment.language_container_deployer import LanguageContainerDeployer
+from exasol.python_extension_common.deployment.language_container_deployer import (
+    LanguageContainerDeployer, LanguageActivationLevel)
 from exasol.python_extension_common.deployment.language_container_builder import LanguageContainerBuilder
 
 BFS_CONTAINER_DIRECTORY = 'container'
@@ -62,19 +64,49 @@ def export_slc(slc_builder, export_slc_async) -> Path | None:
     return Path(export_info.cache_file)
 
 
+@pytest.fixture(scope='session')
+def language_alias(project_short_tag):
+    """
+    The user can override this fixture if they want to provide a more meaningful
+    name for the language alias.
+    """
+    owner = getpass.getuser()
+    return f"PYTHON3-{project_short_tag or 'EXTENSION'}-{owner}"
+
+
 @pytest.fixture(scope="session")
-def upload_slc(slc_builder, export_slc,
+def deploy_slc(slc_builder, export_slc,
                pyexasol_connection, backend_aware_bucketfs_params):
     """
-    The fixture provides a function uploading the language container to a database,
-    according to the selected backends.
+    The fixture provides a function deploying the language container in a database.
+    The function can be called multiple times, allowing to activate the container with
+    multiple aliases. However, the container will be uploaded only once.
     """
+    bucket_file_path = ''
+
     def func(language_alias: str) -> None:
+        nonlocal bucket_file_path
         if (slc_builder is not None) and (export_slc is not None):
             bucketfs_path = bfs.path.build_path(**backend_aware_bucketfs_params,
                                                 path=BFS_CONTAINER_DIRECTORY)
             deployer = LanguageContainerDeployer(pyexasol_connection=pyexasol_connection,
                                                  bucketfs_path=bucketfs_path,
                                                  language_alias=language_alias)
-            deployer.run(container_file=export_slc, alter_system=True, allow_override=True)
+            if bucket_file_path:
+                # The container has already been uploaded and just needs to be activated
+                for alter_type in [LanguageActivationLevel.Session, LanguageActivationLevel.System]:
+                    deployer.activate_container(bucket_file_path, alter_type, allow_override=True)
+            else:
+                bucket_file_path = export_slc.name
+                deployer.run(container_file=export_slc, bucket_file_path=bucket_file_path,
+                             alter_system=True, allow_override=True)
     return func
+
+
+@pytest.fixture(scope="session")
+def deployed_slc(deploy_slc, language_alias) -> None:
+    """
+    The fixture calls deploy_slc() once, with the language_alis defined in the fixture
+    with the corresponded name.
+    """
+    deploy_slc(language_alias)

pytest-slc/test/integration/pytest_slc_test.py

@@ -4,7 +4,8 @@
 
 pytest_plugins = ["pytester"]
 
-LANGUAGE_ALIAS = 'PYTHON3_PYTEST_SLC'
+MAIN_LANGUAGE_ALIAS = 'PYTHON3_PYTEST_SLC'
+ALT_LANGUAGE_ALIAS = 'PYTHON3_PYTEST_SLC_ALT'
 
 _test_code = dedent(fr"""
 import pyexasol
@@ -20,11 +21,15 @@ def slc_builder() -> LanguageContainerBuilder:
         container_builder.prepare_flavor(project_directory)
         yield container_builder
 
-def assert_udf_running(conn: pyexasol.ExaConnection):
+@pytest.fixture(scope='session')
+def language_alias() -> str:
+    return "{MAIN_LANGUAGE_ALIAS}"
+
+def assert_udf_running(conn: pyexasol.ExaConnection, lang_alias: str) -> None:
     with temp_schema(conn) as schema:
         udf_name = 'TEST_UDF'
         udf_create_sql = (
-            f'CREATE OR REPLACE {LANGUAGE_ALIAS} SCALAR SCRIPT "{{schema}}"."{{udf_name}}"() '
+            f'CREATE OR REPLACE {{lang_alias}} SCALAR SCRIPT "{{schema}}"."{{udf_name}}"() '
             'RETURNS BOOLEAN AS '
             'def run(ctx): '
             'return True '
@@ -34,9 +39,12 @@ def assert_udf_running(conn: pyexasol.ExaConnection):
         result = conn.execute(f'SELECT "{{schema}}"."{{udf_name}}"()').fetchall()
         assert result[0][0] is True
 
-def test_upload_slc(upload_slc, backend_aware_database_params):
-    upload_slc("{LANGUAGE_ALIAS}")
-    assert_udf_running(pyexasol.connect(**backend_aware_database_params))
+def test_deploy_slc(deploy_slc, deployed_slc, backend_aware_database_params):
+    # We will activate the SLC also with an alternative alias and check that both
+    # the main and the alternative alias work.
+    deploy_slc("{ALT_LANGUAGE_ALIAS}")
+    for lang_alias in ["{MAIN_LANGUAGE_ALIAS}", "{ALT_LANGUAGE_ALIAS}"]:
+        assert_udf_running(pyexasol.connect(**backend_aware_database_params), lang_alias)
 """)