fix: fixed new tests and merged dev into branch

ref: N25B-256

test/integration/agents/test_ri_commands_agent.py

@@ -7,25 +7,21 @@ import zmq
 from control_backend.agents.ri_command_agent import RICommandAgent
 
 
-@pytest.mark.asyncio
-async def test_setup_bind(monkeypatch):
-    """Test setup with bind=True"""
-    fake_socket = MagicMock()
-    fake_context = MagicMock()
-    fake_context.socket.return_value = fake_socket
+@pytest.fixture
+def zmq_context(mocker):
+    mock_context = mocker.patch("control_backend.agents.vad_agent.azmq.Context.instance")
+    mock_context.return_value = MagicMock()
+    return mock_context
 
-    # Patch Context.instance() to return fake_context
-    monkeypatch.setattr(
-        "control_backend.agents.ri_command_agent.Context",
-        MagicMock(instance=MagicMock(return_value=fake_context)),
-    )
+
+@pytest.mark.asyncio
+async def test_setup_bind(zmq_context, mocker):
+    """Test setup with bind=True"""
+    fake_socket = zmq_context.return_value.socket.return_value
 
     agent = RICommandAgent("test@server", "password", address="tcp://localhost:5555", bind=True)
-
-    monkeypatch.setattr(
-        "control_backend.agents.ri_command_agent.settings",
-        MagicMock(zmq_settings=MagicMock(internal_sub_address="tcp://internal:1234")),
-    )
+    settings = mocker.patch("control_backend.agents.ri_command_agent.settings")
+    settings.zmq_settings.internal_sub_address = "tcp://internal:1234"
 
     await agent.setup()
 
@@ -36,23 +32,13 @@ async def test_setup_bind(monkeypatch):
 
 
 @pytest.mark.asyncio
-async def test_setup_connect(monkeypatch):
+async def test_setup_connect(zmq_context, mocker):
     """Test setup with bind=False"""
-    fake_socket = MagicMock()
-    fake_context = MagicMock()
-    fake_context.socket.return_value = fake_socket
-
-    # Patch Context.instance() to return fake_context
-    monkeypatch.setattr(
-        "control_backend.agents.ri_command_agent.Context",
-        MagicMock(instance=MagicMock(return_value=fake_context)),
-    )
+    fake_socket = zmq_context.return_value.socket.return_value
 
     agent = RICommandAgent("test@server", "password", address="tcp://localhost:5555", bind=False)
-    monkeypatch.setattr(
-        "control_backend.agents.ri_command_agent.settings",
-        MagicMock(zmq_settings=MagicMock(internal_sub_address="tcp://internal:1234")),
-    )
+    settings = mocker.patch("control_backend.agents.ri_command_agent.settings")
+    settings.zmq_settings.internal_sub_address = "tcp://internal:1234"
 
     await agent.setup()