From 89deabf82d6f330dbcec5f54f8ed51834a4e54ba Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 14 Oct 2025 16:09:41 +0100 Subject: [PATCH 1/4] use lewis emulators rather than deviceemulator --- utils/emulator_launcher.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utils/emulator_launcher.py b/utils/emulator_launcher.py index 556ff5a4..c2ba19d9 100644 --- a/utils/emulator_launcher.py +++ b/utils/emulator_launcher.py @@ -646,10 +646,6 @@ def _open(self) -> None: ), ] ) - if self._lewis_additional_path is not None: - lewis_command_line.extend(["-a", self._lewis_additional_path]) - if self._lewis_package is not None: - lewis_command_line.extend(["-k", self._lewis_package]) # Set lewis speed lewis_command_line.extend(["-e", str(self._speed), self._device]) From 6ec42870d2e5f785abf3067324e780e9fa5cd740 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 14 Oct 2025 16:39:03 +0100 Subject: [PATCH 2/4] remove lewis_additional_path and lewis_package options --- tests/linkam95.py | 1 - tests/zfhifi.py | 10 ---------- utils/emulator_launcher.py | 2 -- 3 files changed, 13 deletions(-) diff --git a/tests/linkam95.py b/tests/linkam95.py index 3f6f055e..8dff22fe 100644 --- a/tests/linkam95.py +++ b/tests/linkam95.py @@ -14,7 +14,6 @@ "directory": get_default_ioc_dir("LINKAM95"), "macros": {}, "emulator": EMULATOR_NAME, - "lewis_package": None, }, ] diff --git a/tests/zfhifi.py b/tests/zfhifi.py index 36393c71..d3d1d450 100644 --- a/tests/zfhifi.py +++ b/tests/zfhifi.py @@ -86,16 +86,6 @@ def group3_hall_probe_ioc(iocnum: int) -> dict[str, Any]: "directory": get_default_ioc_dir("G3HALLPR", iocnum=iocnum), "emulator": "group3hallprobe", "emulator_id": f"group3hallprobe_{iocnum}", - "lewis_additional_path": os.path.join( - "c:\\", - "Instrument", - "Apps", - "EPICS", - "support", - "group3hallprobe", - "master", - "system_tests", - ), "macros": { "FIELD_SCAN_RATE": ".1 second", "TEMP_SCAN_RATE": ".1 second", diff --git a/utils/emulator_launcher.py b/utils/emulator_launcher.py index c2ba19d9..53c4d24a 100644 --- a/utils/emulator_launcher.py +++ b/utils/emulator_launcher.py @@ -588,8 +588,6 @@ def __init__( "python_path", os.path.join(DEFAULT_PY_PATH, "python.exe") ) self._lewis_protocol: str = options.get("lewis_protocol", "stream") - self._lewis_additional_path: str = options.get("lewis_additional_path", emulator_path) - self._lewis_package: str = options.get("lewis_package", "lewis_emulators") self._default_timeout: float = options.get("default_timeout", 5) self._speed: float = options.get("speed", 100) From 8741182d0f3e35b7d7e4eae7bb9869d7495c2d79 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 28 Oct 2025 15:48:04 +0000 Subject: [PATCH 3/4] ruff format --- utils/emulator_launcher.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/emulator_launcher.py b/utils/emulator_launcher.py index 53c4d24a..41dbce0e 100644 --- a/utils/emulator_launcher.py +++ b/utils/emulator_launcher.py @@ -346,7 +346,7 @@ def wrapper(msg: str) -> str | None: if msg is None: msg = ( - "Expected function '{}' to evaluate to True " "when reading emulator property '{}'." + "Expected function '{}' to evaluate to True when reading emulator property '{}'." ).format(func.__name__, emulator_property) err = self._wait_for_emulator_lambda(partial(wrapper, msg), timeout) @@ -400,8 +400,7 @@ def wrapper(msg: str) -> str | None: if msg is None: msg = ( - "Expected function '{}' to evaluate to False " - "when reading emulator property '{}'." + "Expected function '{}' to evaluate to False when reading emulator property '{}'." ).format(func.__name__, emulator_property) err = self._wait_for_emulator_lambda(partial(wrapper, msg), timeout) From ac44d76f65a6f9a8564b54b45887062bf26d3a39 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 28 Oct 2025 15:49:08 +0000 Subject: [PATCH 4/4] Trigger CI