pytest-bec-e2e 3.47.1__py3-none-any.whl → 3.74.2__py3-none-any.whl

PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: pytest-bec-e2e
-Version: 3.47.1
+Version: 3.74.2
 Summary: BEC pytest plugin for end-to-end tests
 Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
 Project-URL: Homepage, https://github.com/bec-project/bec
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: bec-ipython-client
 Requires-Dist: bec-lib
 Requires-Dist: bec-server

pyproject.toml

@@ -4,9 +4,9 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pytest-bec-e2e"
-version = "3.47.1"
+version = "3.74.2"
 description = "BEC pytest plugin for end-to-end tests"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Programming Language :: Python :: 3",

pytest_bec_e2e/plugin.py

@@ -14,11 +14,47 @@ from redis import Redis
 from bec_ipython_client import BECIPythonClient
 from bec_lib.client import BECClient
 from bec_lib.config_helper import ConfigHelper
+from bec_lib.endpoints import MessageEndpoints
 from bec_lib.redis_connector import RedisConnector
-from bec_lib.service_config import ServiceConfig
+from bec_lib.service_config import ServiceConfig, ServiceConfigModel
 from bec_lib.tests.utils import wait_for_empty_queue
 
 
+class LogTestTool:
+    def __init__(self, client: BECIPythonClient):
+        self._conn: RedisConnector = client.connector
+        self._logs = None
+
+    def fetch(self, count: int | None = None) -> None:
+        """Fetch logs from the server and store them for interrogation, get all by default or get
+        the last `count` logs (latter will not fetch read logs again if they have been seen!)"""
+        log_data = self._conn.xread(MessageEndpoints.log(), from_start=(count is None), count=count)
+        if log_data is None:
+            self._logs = None
+            return
+        self._logs = list(item["data"].log_msg["text"] for item in log_data)
+
+    def is_present_in_any_message(self, needle: str) -> bool:
+        """Assert that the provided string is in at least one log message"""
+        if self._logs is None:
+            raise RuntimeError("No logs fetched")
+        for log in self._logs:
+            if needle in log:
+                return True
+        return False
+
+    def are_present_in_order(self, needles: list[str]) -> tuple[bool, str]:
+        if self._logs is None:
+            raise RuntimeError("No logs fetched")
+        _needles = list(reversed(needles.copy()))
+        for log in self._logs:
+            if _needles[-1] in log:
+                _needles.pop()
+            if len(_needles) == 0:
+                return True, ""
+        return False, _needles[0]
+
+
 @pytest.hookimpl
 def pytest_addoption(parser):
     parser.addoption("--start-servers", action="store_true", default=False)
@@ -35,27 +71,6 @@ bec_servers_scope = (
     lambda fixture_name, config: config.getoption("--flush-redis") and "function" or "session"
 )
 
-services_config_template = """
-redis:
-  host: %(redis_host)s
-  port: %(redis_port)s
-mongodb:
-  host: "localhost"
-  port: 27017
-scibec:
-  host: http://localhost
-  port: 3030
-  beamline: TestBeamline
-service_config:
-  abort_on_ctrl_c: False
-  enforce_ACLs: False
-  file_writer:
-    plugin: default_NeXus_format
-    base_path: %(file_writer_base_path)s
-  log_writer:
-    base_path: %(file_writer_base_path)s
-"""
-
 
 def _check_path(file_path):
     if os.path.exists(file_path):
@@ -165,15 +180,13 @@ def bec_servers(
     # file_writer_path.mkdir(exist_ok=True)
     # 3) services config
     with open(bec_services_config_file_path, "w") as services_config_file:
-        services_config_file.write(
-            services_config_template
-            % {
-                "redis_host": redis_host,
-                "redis_port": redis_port,
-                "file_writer_base_path": file_writer_path,
-            }
+        service_config = ServiceConfigModel(
+            redis={"host": redis_host, "port": redis_port},
+            file_writer={"base_path": str(file_writer_path)},
         )
 
+        services_config_file.write(service_config.model_dump_json(indent=4))
+
     if _start_servers:
         from bec_server.bec_server_utils.service_handler import ServiceHandler
 
@@ -239,3 +252,9 @@ def bec_client_lib(bec_client_lib_with_demo_config):
     bec.queue.request_scan_continuation()
     wait_for_empty_queue(bec)
     yield bec
+
+
+@pytest.fixture
+def bec_ipython_client_fixture_with_logtool(bec_ipython_client_fixture):
+    bec: BECIPythonClient = bec_ipython_client_fixture
+    yield bec, LogTestTool(bec)

{pytest_bec_e2e-3.47.1.dist-info → pytest_bec_e2e-3.74.2.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: pytest-bec-e2e
-Version: 3.47.1
+Version: 3.74.2
 Summary: BEC pytest plugin for end-to-end tests
 Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
 Project-URL: Homepage, https://github.com/bec-project/bec
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: bec-ipython-client
 Requires-Dist: bec-lib
 Requires-Dist: bec-server

pytest_bec_e2e-3.74.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+.gitignore,sha256=UmJ0gTRAPp4EI1A6tb9Pi-k5uxDIb_NWJU9ye6AW-8Y,3306
+PKG-INFO,sha256=PKnYHcy9DVkrUGAyJkFKwqajIwV5DrLrpFK8zzq3dr8,526
+pyproject.toml,sha256=_AWdDeJXuosmIN_xT-a7LxjcEo_8043pre79v4AAc-M,780
+pytest_bec_e2e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pytest_bec_e2e/plugin.py,sha256=YdALungShHFvfflRViPTdz-lIl6H3JbYPxDhWsPKCkg,9426
+pytest_bec_e2e-3.74.2.dist-info/METADATA,sha256=PKnYHcy9DVkrUGAyJkFKwqajIwV5DrLrpFK8zzq3dr8,526
+pytest_bec_e2e-3.74.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pytest_bec_e2e-3.74.2.dist-info/entry_points.txt,sha256=FLvRZqsjOQkvTOuo9A2kiyG9vMBia2sXREgVHb35DXA,56
+pytest_bec_e2e-3.74.2.dist-info/RECORD,,

pytest_bec_e2e-3.47.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-.gitignore,sha256=UmJ0gTRAPp4EI1A6tb9Pi-k5uxDIb_NWJU9ye6AW-8Y,3306
-PKG-INFO,sha256=tYsfggjzwM0RWc6ohwi8gq9hWb66TZ-Zyxn1uqDRGfc,526
-pyproject.toml,sha256=OWl-0WuM9_Mo-UUcXGAig6kJ7O-U5q2Umqf4DbnCmro,780
-pytest_bec_e2e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytest_bec_e2e/plugin.py,sha256=ukIzIC0ebt2YC1p7TCcDqxKNDfHmATXvtTfAwyxKILI,8196
-pytest_bec_e2e-3.47.1.dist-info/METADATA,sha256=tYsfggjzwM0RWc6ohwi8gq9hWb66TZ-Zyxn1uqDRGfc,526
-pytest_bec_e2e-3.47.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pytest_bec_e2e-3.47.1.dist-info/entry_points.txt,sha256=FLvRZqsjOQkvTOuo9A2kiyG9vMBia2sXREgVHb35DXA,56
-pytest_bec_e2e-3.47.1.dist-info/RECORD,,