tests: Move client manager tests to test_client_manager

Author: Davidyz

tests/test_common.py

@@ -150,79 +150,6 @@ async def test_try_server_versions():
         assert await try_server("http://localhost:8300") is False
 
 
-@pytest.mark.asyncio
-async def test_get_client():
-    config = Config(db_url="https://test_host:1234", db_path="test_db")
-    config1 = Config(
-        db_url="http://test_host1:1234",
-        db_path="test_db",
-        db_settings={"anonymized_telemetry": True},
-    )
-    config1_alt = Config(
-        db_url="http://test_host1:1234",
-        db_path="test_db",
-        db_settings={"anonymized_telemetry": True, "other_setting": "value"},
-    )
-    # Patch chromadb.AsyncHttpClient to avoid actual network calls
-    with (
-        patch("chromadb.AsyncHttpClient") as MockAsyncHttpClient,
-        patch("vectorcode.common.try_server", return_value=True),
-    ):
-        mock_client = MagicMock(spec=AsyncClientAPI)
-        MockAsyncHttpClient.return_value = mock_client
-
-        async with (
-            ClientManager().get_client(config) as client,
-        ):
-            assert isinstance(client, AsyncClientAPI)
-            MockAsyncHttpClient.assert_called()
-            assert (
-                MockAsyncHttpClient.call_args.kwargs["settings"].chroma_server_host
-                == "test_host"
-            )
-            assert (
-                MockAsyncHttpClient.call_args.kwargs["settings"].chroma_server_http_port
-                == 1234
-            )
-            assert (
-                MockAsyncHttpClient.call_args.kwargs["settings"].anonymized_telemetry
-                is False
-            )
-            assert (
-                MockAsyncHttpClient.call_args.kwargs[
-                    "settings"
-                ].chroma_server_ssl_enabled
-                is True
-            )
-
-            async with (
-                ClientManager().get_client(config1) as client1,
-                ClientManager().get_client(config1_alt) as client1_alt,
-            ):
-                assert isinstance(client1, AsyncClientAPI)
-                MockAsyncHttpClient.assert_called()
-                assert (
-                    MockAsyncHttpClient.call_args.kwargs["settings"].chroma_server_host
-                    == "test_host1"
-                )
-                assert (
-                    MockAsyncHttpClient.call_args.kwargs[
-                        "settings"
-                    ].chroma_server_http_port
-                    == 1234
-                )
-                assert (
-                    MockAsyncHttpClient.call_args.kwargs[
-                        "settings"
-                    ].anonymized_telemetry
-                    is True
-                )
-
-                # Test with multiple db_settings, including an invalid one.  The invalid one
-                # should be filtered out inside get_client.
-                assert id(client1_alt) == id(client1)
-
-
 def test_verify_ef():
     # Mocking AsyncCollection and Config
     mock_collection = MagicMock()
@@ -582,31 +509,75 @@ async def test_wait_for_server_timeout():
 
 @pytest.mark.asyncio
 async def test_client_manager_get_client():
-    ClientManager().clear()
+    config = Config(db_url="https://test_host:1234", db_path="test_db")
+    config1 = Config(
+        db_url="http://test_host1:1234",
+        db_path="test_db",
+        db_settings={"anonymized_telemetry": True},
+    )
+    config1_alt = Config(
+        db_url="http://test_host1:1234",
+        db_path="test_db",
+        db_settings={"anonymized_telemetry": True, "other_setting": "value"},
+    )
+    # Patch chromadb.AsyncHttpClient to avoid actual network calls
     with (
-        patch("vectorcode.common.try_server", return_value=False) as mock_try_server,
-        patch(
-            "vectorcode.common.start_server", return_value=MagicMock()
-        ) as mock_start_server,
+        patch("chromadb.AsyncHttpClient") as MockAsyncHttpClient,
+        patch("vectorcode.common.try_server", return_value=True),
     ):
-        # need to start a new server
-        manager = ClientManager()
-        async with manager.get_client(Config()):
-            mock_try_server.assert_called_once()
-            mock_start_server.assert_called_once()
+        mock_client = MagicMock(spec=AsyncClientAPI)
+        MockAsyncHttpClient.return_value = mock_client
 
-    ClientManager().clear()
-    with (
-        patch("vectorcode.common.try_server", return_value=True) as mock_try_server,
-        patch(
-            "vectorcode.common.start_server", return_value=MagicMock()
-        ) as mock_start_server,
-    ):
-        # need to start a new server
-        manager = ClientManager()
-        async with manager.get_client(Config()):
-            mock_try_server.assert_called_once()
-            mock_start_server.assert_not_called()
+        async with (
+            ClientManager().get_client(config) as client,
+        ):
+            assert isinstance(client, AsyncClientAPI)
+            MockAsyncHttpClient.assert_called()
+            assert (
+                MockAsyncHttpClient.call_args.kwargs["settings"].chroma_server_host
+                == "test_host"
+            )
+            assert (
+                MockAsyncHttpClient.call_args.kwargs["settings"].chroma_server_http_port
+                == 1234
+            )
+            assert (
+                MockAsyncHttpClient.call_args.kwargs["settings"].anonymized_telemetry
+                is False
+            )
+            assert (
+                MockAsyncHttpClient.call_args.kwargs[
+                    "settings"
+                ].chroma_server_ssl_enabled
+                is True
+            )
+
+            async with (
+                ClientManager().get_client(config1) as client1,
+                ClientManager().get_client(config1_alt) as client1_alt,
+            ):
+                assert isinstance(client1, AsyncClientAPI)
+                MockAsyncHttpClient.assert_called()
+                assert (
+                    MockAsyncHttpClient.call_args.kwargs["settings"].chroma_server_host
+                    == "test_host1"
+                )
+                assert (
+                    MockAsyncHttpClient.call_args.kwargs[
+                        "settings"
+                    ].chroma_server_http_port
+                    == 1234
+                )
+                assert (
+                    MockAsyncHttpClient.call_args.kwargs[
+                        "settings"
+                    ].anonymized_telemetry
+                    is True
+                )
+
+                # Test with multiple db_settings, including an invalid one.  The invalid one
+                # should be filtered out inside get_client.
+                assert id(client1_alt) == id(client1)
 
 
 @pytest.mark.asyncio