Isolate re_manager_pc_copy and harden kernel client startup

Author: davidpcls

bluesky_httpserver/tests/conftest.py

@@ -8,6 +8,7 @@
 from bluesky_queueserver.manager.tests.common import (
     ReManager,
     condition_manager_idle,
+    copy_default_profile_collection,
     wait_for_condition,
     zmq_secure_request,
 )
@@ -270,6 +271,40 @@ def re_manager_module():
                 manager.kill_manager()
 
 
+@pytest.fixture
+def re_manager_pc_copy(tmp_path):  # noqa: F811
+    ports = _ports_for_worker()
+    _set_zmq_env(ports["zmq_control_client"], ports["zmq_info_client"])
+
+    pc_path = copy_default_profile_collection(tmp_path)
+
+    manager = ReManager(
+        params=[
+            f"--startup-dir={pc_path}",
+            f"--zmq-control-addr={ports['zmq_control_server']}",
+            f"--zmq-info-addr={ports['zmq_info_server']}",
+            f"--redis-name-prefix={_redis_name_prefix(scope='re_manager_pc_copy')}",
+        ],
+        set_redis_name_prefix=False,
+    )
+    failed_to_start = False
+
+    try:
+        _wait_for_manager_ready()
+        yield pc_path
+    except Exception:
+        failed_to_start = True
+        raise
+    finally:
+        if failed_to_start:
+            manager.kill_manager()
+        else:
+            try:
+                manager.stop_manager(timeout=30)
+            except Exception:
+                manager.kill_manager()
+
+
 @pytest.fixture
 def re_manager_cmd():  # noqa: F811
     manager = None

bluesky_httpserver/tests/test_core_api_fs.py

@@ -5,7 +5,6 @@
 from bluesky_queueserver.manager.tests.common import (  # noqa F401
     append_code_to_last_startup_file,
     copy_default_profile_collection,
-    re_manager_pc_copy,
     set_qserver_zmq_address,
     set_qserver_zmq_public_key,
 )
@@ -20,6 +19,7 @@
     add_plans_to_queue,
     fastapi_server_fs,
     re_manager_cmd,
+    re_manager_pc_copy,
     request_to_json,
     wait_for_environment_to_be_created,
     wait_for_manager_state_idle,

bluesky_httpserver/tests/test_core_api_main.py

@@ -9,7 +9,6 @@
     append_code_to_last_startup_file,
     copy_default_profile_collection,
     ip_kernel_simple_client,
-    re_manager_pc_copy,
 )
 
 from bluesky_httpserver.tests.conftest import (  # noqa F401
@@ -18,6 +17,7 @@
     add_plans_to_queue,
     fastapi_server,
     re_manager_cmd,
+    re_manager_pc_copy,
     request_to_json,
     wait_for_environment_to_be_closed,
     wait_for_environment_to_be_created,
@@ -1709,7 +1709,14 @@ def check_status(ip_kernel_state, ip_kernel_captured):
     kernel_int_params = {}
 
     if option == "ip_client":
-        ip_kernel_simple_client.start()
+        for _ in range(5):
+            try:
+                ip_kernel_simple_client.start()
+                break
+            except (TypeError, KeyError):
+                ttime.sleep(1)
+        else:
+            pytest.fail("Failed to start IP kernel client after 5 attempts")
         ip_kernel_simple_client.execute_with_check(_busy_script_01)
     elif option == "script":
         resp2 = request_to_json("post", "/script/upload", json={"script": _busy_script_01})

bluesky_httpserver/tests/test_server.py

@@ -6,7 +6,6 @@
 from bluesky_queueserver.manager.tests.common import (  # noqa F401
     append_code_to_last_startup_file,
     copy_default_profile_collection,
-    re_manager_pc_copy,
     set_qserver_zmq_address,
     set_qserver_zmq_public_key,
 )
@@ -17,6 +16,7 @@
     add_plans_to_queue,
     fastapi_server_fs,
     re_manager_cmd,
+    re_manager_pc_copy,
     request_to_json,
     setup_server_with_config_file,
     wait_for_environment_to_be_created,