pytest-bec-e2e 2.9.3__py3-none-any.whl → 2.9.5__py3-none-any.whl

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytest-bec-e2e
-Version: 2.9.3
+Version: 2.9.5
 Summary: BEC pytest plugin for end-to-end tests
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pytest-bec-e2e"
-version = "2.9.3"
+version = "2.9.5"
 description = "BEC pytest plugin for end-to-end tests"
 requires-python = ">=3.10"
 classifiers = [

pytest_bec_e2e/plugin.py

@@ -9,6 +9,7 @@ import tempfile
 
 import pytest
 from pytest_redis import factories as pytest_redis_factories
+from redis import Redis
 
 from bec_ipython_client import BECIPythonClient
 from bec_lib import BECClient, ConfigHelper, RedisConnector, ServiceConfig
@@ -25,7 +26,7 @@ def pytest_addoption(parser):
 
 
 redis_server_fixture = None
-bec_redis = None
+bec_redis_fixture = None
 _start_servers = False
 bec_servers_scope = (
     lambda fixture_name, config: config.getoption("--flush-redis") and "function" or "session"
@@ -72,7 +73,7 @@ def _get_tmp_dir():
 @pytest.hookimpl
 def pytest_configure(config):
     global redis_server_fixture
-    global bec_redis
+    global bec_redis_fixture
     global _start_servers
     global _bec_servers_scope
 
@@ -92,12 +93,12 @@ def pytest_configure(config):
         )
 
         if config.getoption("--flush-redis"):
-            bec_redis = pytest_redis_factories.redisdb("redis_server_fixture")
+            bec_redis_fixture = pytest_redis_factories.redisdb("redis_server_fixture")
             _bec_servers_scope = "function"  # have to restart servers at each test
         else:
-            bec_redis = redis_server_fixture
+            bec_redis_fixture = redis_server_fixture
     else:
-        # do not automatically start redis - bec_redis will use existing
+        # do not automatically start redis - bec_redis_fixture will use existing
         # process, will wait for 3 seconds max (must be running already);
         # there is no point checking if we want to flush redis
         # since it would remove available scans which are only populated
@@ -105,7 +106,7 @@ def pytest_configure(config):
         redis_server_fixture = pytest_redis_factories.redis_noproc(
             host=config.getoption("--bec-redis-host"), startup_timeout=3
         )
-        bec_redis = redis_server_fixture
+        bec_redis_fixture = redis_server_fixture
 
     _start_servers = config.getoption("--start-servers")
 
@@ -134,14 +135,24 @@ def bec_test_config_file_path(bec_files_path):
     return pathlib.Path(bec_files_path / "test_config.yaml")
 
 
+@pytest.fixture(scope=bec_servers_scope)
+def bec_redis_host_port(request, bec_redis_fixture):
+    if isinstance(bec_redis_fixture, Redis):
+        server_fixture = request.getfixturevalue("redis_server_fixture")
+        return server_fixture.host, server_fixture.port
+    else:
+        return bec_redis_fixture.host, bec_redis_fixture.port
+
+
 @pytest.fixture(scope=bec_servers_scope)
 def bec_servers(
     test_config_yaml_file_path,
     bec_services_config_file_path,
     bec_test_config_file_path,
     bec_files_path,
-    redis_server_fixture,
+    bec_redis_host_port,
 ):
+    redis_host, redis_port = bec_redis_host_port
     # ensure configuration files are written where appropriate for tests,
     # i.e. either in /tmp/pytest/... directory, or following user "--files-path"
     # 1) test config (devices...)
@@ -154,8 +165,8 @@ def bec_servers(
         services_config_file.write(
             services_config_template
             % {
-                "redis_host": redis_server_fixture.host,
-                "redis_port": redis_server_fixture.port,
+                "redis_host": redis_host,
+                "redis_port": redis_port,
                 "file_writer_base_path": file_writer_path,
             }
         )
@@ -183,7 +194,9 @@ def bec_servers(
 
 
 @pytest.fixture
-def bec_ipython_client_with_demo_config(bec_redis, bec_services_config_file_path, bec_servers):
+def bec_ipython_client_with_demo_config(
+    bec_redis_fixture, bec_services_config_file_path, bec_servers
+):
     config = ServiceConfig(bec_services_config_file_path)
     bec = BECIPythonClient(config, RedisConnector, forced=True)
     bec.start()
@@ -196,7 +209,7 @@ def bec_ipython_client_with_demo_config(bec_redis, bec_services_config_file_path
 
 
 @pytest.fixture
-def bec_client_lib_with_demo_config(bec_redis, bec_services_config_file_path, bec_servers):
+def bec_client_lib_with_demo_config(bec_redis_fixture, bec_services_config_file_path, bec_servers):
     config = ServiceConfig(bec_services_config_file_path)
     bec = BECClient(config, RedisConnector, forced=True, wait_for_server=True)
     bec.start()

{pytest_bec_e2e-2.9.3.dist-info → pytest_bec_e2e-2.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytest-bec-e2e
-Version: 2.9.3
+Version: 2.9.5
 Summary: BEC pytest plugin for end-to-end tests
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec

pytest_bec_e2e-2.9.5.dist-info/RECORD

@@ -0,0 +1,9 @@
+.gitignore,sha256=cgNvnvYMgOWjrnVQEgTN5r33OPWtMgSAZF2c0L8_V84,3297
+PKG-INFO,sha256=RQ3wUYTB89WuCsDnuHk7mt9sYUfnHQn3g4lGLINJLXA,515
+pyproject.toml,sha256=K17J5bRaRPohR2j5zhHh5r0CSXAZPqeeW5lfcFH5IaE,769
+pytest_bec_e2e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pytest_bec_e2e/plugin.py,sha256=Lit1JNbcRL7JunXO8CyNj4exP9szoGSRb95MTFYUfMs,8191
+pytest_bec_e2e-2.9.5.dist-info/METADATA,sha256=RQ3wUYTB89WuCsDnuHk7mt9sYUfnHQn3g4lGLINJLXA,515
+pytest_bec_e2e-2.9.5.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+pytest_bec_e2e-2.9.5.dist-info/entry_points.txt,sha256=FLvRZqsjOQkvTOuo9A2kiyG9vMBia2sXREgVHb35DXA,56
+pytest_bec_e2e-2.9.5.dist-info/RECORD,,

pytest_bec_e2e-2.9.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-.gitignore,sha256=cgNvnvYMgOWjrnVQEgTN5r33OPWtMgSAZF2c0L8_V84,3297
-PKG-INFO,sha256=rk046YIc4JWcHZp7tOtrw-FBQUqqVGaXg3J-ljqohKg,515
-pyproject.toml,sha256=kQTf72kPPSHTV9gUaBQT7yK7MV07KMMx022ipelBfrA,769
-pytest_bec_e2e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytest_bec_e2e/plugin.py,sha256=HHjAkLtzddvSpuL33zHDag3XeyL5_a1AZ614kIT8xEQ,7737
-pytest_bec_e2e-2.9.3.dist-info/METADATA,sha256=rk046YIc4JWcHZp7tOtrw-FBQUqqVGaXg3J-ljqohKg,515
-pytest_bec_e2e-2.9.3.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-pytest_bec_e2e-2.9.3.dist-info/entry_points.txt,sha256=FLvRZqsjOQkvTOuo9A2kiyG9vMBia2sXREgVHb35DXA,56
-pytest_bec_e2e-2.9.3.dist-info/RECORD,,