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 556ff5a4..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) @@ -588,8 +587,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) @@ -646,10 +643,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])