fix(tests): make use of BECDockArea with client mixin to start server and use it in tests

Depending on the test, auto-updates are enabled or not.

tests/end-2-end/conftest.py

@@ -5,9 +5,9 @@ from contextlib import contextmanager
 import pytest
 from bec_lib.endpoints import MessageEndpoints
 
+from bec_widgets.cli.client import BECDockArea
 from bec_widgets.cli.client_utils import _start_plot_process
 from bec_widgets.utils import BECDispatcher
-from bec_widgets.widgets.containers.dock import BECDockArea
 from bec_widgets.widgets.containers.figure import BECFigure
 
 
@@ -48,5 +48,20 @@ def rpc_server_figure(gui_id, bec_client_lib):
 
 @pytest.fixture
 def rpc_server_dock(gui_id, bec_client_lib):
-    with plot_server(gui_id, BECDockArea, bec_client_lib) as server:
+    dock_area = BECDockArea(gui_id=gui_id)
-        yield server
+    dock_area._auto_updates_enabled = False
+    try:
+        dock_area.start_server(wait=True)
+        yield dock_area
+    finally:
+        dock_area.close()
+
+
+@pytest.fixture
+def rpc_server_dock_w_auto_updates(gui_id, bec_client_lib):
+    dock_area = BECDockArea(gui_id=gui_id)
+    try:
+        dock_area.start_server(wait=True)
+        yield dock_area
+    finally:
+        dock_area.close()

tests/end-2-end/test_bec_dock_rpc_e2e.py

@@ -14,7 +14,7 @@ from bec_widgets.utils import Colors
 
 def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
     # BEC client shortcuts
-    dock = BECDockArea(rpc_server_dock)
+    dock = rpc_server_dock
     client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
@@ -124,7 +124,7 @@ def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
 
 
 def test_dock_manipulations_e2e(rpc_server_dock):
-    dock = BECDockArea(rpc_server_dock)
+    dock = rpc_server_dock
 
     d0 = dock.add_dock("dock_0")
     d1 = dock.add_dock("dock_1")
@@ -156,7 +156,7 @@ def test_dock_manipulations_e2e(rpc_server_dock):
 
 
 def test_ring_bar(rpc_server_dock):
-    dock = BECDockArea(rpc_server_dock)
+    dock = rpc_server_dock
 
     d0 = dock.add_dock(name="dock_0")
 
@@ -183,7 +183,7 @@ def test_ring_bar(rpc_server_dock):
 
 
 def test_ring_bar_scan_update(bec_client_lib, rpc_server_dock):
-    dock = BECDockArea(rpc_server_dock)
+    dock = rpc_server_dock
 
     d0 = dock.add_dock("dock_0")
 
@@ -234,40 +234,31 @@ def test_ring_bar_scan_update(bec_client_lib, rpc_server_dock):
     assert bar_config["rings"][1]["max_value"] == final_samy
 
 
-def test_auto_update(bec_client_lib, rpc_server_dock, qtbot):
+def test_auto_update(bec_client_lib, rpc_server_dock_w_auto_updates, qtbot):
-    dock = BECDockArea(rpc_server_dock)
-
-    AutoUpdates.enabled = True
-    AutoUpdates.create_default_dock = True
-    dock.auto_updates = AutoUpdates(gui=dock)
-    dock.auto_updates.start_default_dock()
-
-    def get_default_figure():
-        return dock.auto_updates.get_default_figure()
-
-    qtbot.waitUntil(lambda: get_default_figure() is not None, timeout=10000)
-    plt = get_default_figure()
-
-    dock.selected_device = "bpm4i"
-
-    # we need to start the update script manually; normally this is done when the GUI is started
-    dock._start_update_script()
-
     client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
     queue = client.queue
+    dock = rpc_server_dock_w_auto_updates
+
+    def get_default_figure():
+        return dock.auto_updates.get_default_figure()
+
+    plt = get_default_figure()
+
+    dock.selected_device = "bpm4i"
 
     status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
     status.wait()
 
-    item = queue.scan_storage.storage[-1]
-    last_scan_data = item.live_data if hasattr(item, "live_data") else item.data
-
     # get data from curves
     widgets = plt.widget_list
+    qtbot.waitUntil(lambda: len(plt.widget_list) > 0, timeout=5000)
     plt_data = widgets[0].get_all_data()
 
+    item = queue.scan_storage.storage[-1]
+    last_scan_data = item.live_data if hasattr(item, "live_data") else item.data
+
     # check plotted data
     assert (
         plt_data[f"Scan {status.scan.scan_number} - bpm4i"]["x"]
@@ -300,4 +291,3 @@ def test_auto_update(bec_client_lib, rpc_server_dock, qtbot):
         plt_data[f"Scan {status.scan.scan_number} - {dock.selected_device}"]["y"]
         == last_scan_data["samy"]["samy"].val
     )
-    dock.auto_updates.shutdown()