From bb80286ffd85d451d4fb8a264c8b93ac9d06f122 Mon Sep 17 00:00:00 2001 From: thopkins32 Date: Fri, 16 Oct 2026 15:57:01 -0400 Subject: [PATCH] Fix tests based on changes in bluesky-queueserver Assisted-by: oh-my-pi:claude-opus-5.5 --- .../tests/test_auth_for_websockets.py | 2 +- src/bluesky_httpserver/tests/test_core_api_main.py | 11 ++++++++++- .../tests/test_system_info_socket.py | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/bluesky_httpserver/tests/test_auth_for_websockets.py b/src/bluesky_httpserver/tests/test_auth_for_websockets.py index 3d5c65f..c860a5a 100644 --- a/src/bluesky_httpserver/tests/test_auth_for_websockets.py +++ b/src/bluesky_httpserver/tests/test_auth_for_websockets.py @@ -115,7 +115,7 @@ def test_websocket_auth_01( """ # Start RE Manager - params = ["--zmq-publish-console", "ON"] + params = ["--zmq-publish-info", "ON"] re_manager_cmd(params) setup_server_with_config_file(config_file_str=config_toy_test, tmpdir=tmpdir, monkeypatch=monkeypatch) diff --git a/src/bluesky_httpserver/tests/test_core_api_main.py b/src/bluesky_httpserver/tests/test_core_api_main.py index 5b4a555..1d6c12e 100644 --- a/src/bluesky_httpserver/tests/test_core_api_main.py +++ b/src/bluesky_httpserver/tests/test_core_api_main.py @@ -1466,10 +1466,19 @@ def test_http_server_re_runs(re_manager, fastapi_server, suffix, expected_n_item assert wait_for_manager_state_idle(30), "Timeout" -def test_http_server_re_metadata(re_manager, fastapi_server): # noqa F811 +_add_metadata_key_to_md = """ +RE.md['metadata_key'] = 'metadata_value' +""" + + +def test_http_server_re_metadata(re_manager_cmd, fastapi_server, tmp_path): # noqa F811 """ Basic test for ``/re/metadata`` API. """ + pc_path = copy_default_profile_collection(tmp_path) + append_code_to_last_startup_file(pc_path, additional_code=_add_metadata_key_to_md) + re_manager_cmd(["--startup-dir", pc_path, "--permitted-re-metadata-keys", "/metadata_key", "/versions"]) + request_to_json("post", "/environment/open") assert wait_for_environment_to_be_created(10), "Timeout" diff --git a/src/bluesky_httpserver/tests/test_system_info_socket.py b/src/bluesky_httpserver/tests/test_system_info_socket.py index 5bfa3af..78136fe 100644 --- a/src/bluesky_httpserver/tests/test_system_info_socket.py +++ b/src/bluesky_httpserver/tests/test_system_info_socket.py @@ -88,7 +88,7 @@ def test_http_server_system_info_socket_1( fastapi_server_fs() # Start RE Manager - params = ["--zmq-publish-console", "ON"] + params = ["--zmq-publish-info", "ON"] if zmq_port is not None: params.extend(["--zmq-info-addr", f"tcp://*:{zmq_port}"]) re_manager_cmd(params)