Skip to content

use lewis emulators rather than deviceemulator #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

use lewis emulators rather than deviceemulator #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89deabf
use lewis emulators rather than deviceemulator
rerpha Oct 14, 2025
6ec4287
remove lewis_additional_path and lewis_package options
rerpha Oct 14, 2025
8741182
ruff format
rerpha Oct 28, 2025
ac44d76
Trigger CI
rerpha Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tests/linkam95.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"directory": get_default_ioc_dir("LINKAM95"),
"macros": {},
"emulator": EMULATOR_NAME,
"lewis_package": None,
},
]

Expand Down
10 changes: 0 additions & 10 deletions tests/zfhifi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 2 additions & 9 deletions utils/emulator_launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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])
Expand Down
Loading