Skip to content

Commit 36fcb4a

Browse files
committed
Fixing up test
1 parent d4c0e6a commit 36fcb4a

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

bluesky_httpserver/tests/test_console_output.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ def test_http_server_stream_console_output_1(
9696
monkeypatch,
9797
re_manager_cmd,
9898
fastapi_server_fs,
99-
zmq_port, # noqa F811
10099
use_custom_port,
101100
):
102101
"""
@@ -181,7 +180,6 @@ def test_http_server_console_output_1(
181180
monkeypatch,
182181
re_manager_cmd,
183182
fastapi_server_fs,
184-
zmq_port,
185183
zmq_encoding, # noqa F811
186184
use_custom_port,
187185
):
@@ -265,7 +263,6 @@ def test_http_server_console_output_update_1(
265263
monkeypatch,
266264
re_manager_cmd,
267265
fastapi_server_fs,
268-
zmq_port, # noqa F811
269266
use_custom_port,
270267
):
271268
"""
@@ -411,7 +408,6 @@ def test_http_server_console_output_socket_1(
411408
monkeypatch,
412409
re_manager_cmd,
413410
fastapi_server_fs,
414-
zmq_port, # noqa F811
415411
use_custom_port,
416412
):
417413
"""

bluesky_httpserver/tests/test_system_info_socket.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,13 @@ def __del__(self):
7272
@pytest.mark.parametrize("use_custom_port", (False, True))
7373
@pytest.mark.parametrize("endpoint", ["/info/ws", "/status/ws"])
7474
def test_http_server_system_info_socket_1(
75-
monkeypatch, re_manager_cmd, fastapi_server_fs, zmq_port, endpoint # noqa F811
75+
monkeypatch, re_manager_cmd, fastapi_server_fs, use_custom_port, endpoint # noqa F811
7676
):
7777
"""
7878
Test for ``/info/ws`` and ``/status/ws`` websockets
7979
"""
8080
# Start HTTP Server
81+
zmq_port = get_free_tcp_port() if use_custom_port else None
8182
if zmq_port is not None:
8283
monkeypatch.setenv("QSERVER_ZMQ_INFO_ADDRESS", f"tcp://localhost:{zmq_port}")
8384
fastapi_server_fs()

0 commit comments

Comments
 (0)