chore: test cleanup (#43)

* chore: remove pytest warning * chore: better engine cleanup * fix: remove params added to engine init * chore: remove engine connector.close when created from engine args * chore: remove engine connector.close from component classes --------- Co-authored-by: Averi Kitsch <akitsch@google.com>

Author: vishwarajanand

pyproject.toml

@@ -50,6 +50,9 @@ test = [
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
+[tool.pytest.ini_options]
+asyncio_default_fixture_loop_scope = "class"
+
 [tool.black]
 target-version = ['py39']
 
@@ -64,4 +67,4 @@ disallow_incomplete_defs = true
 exclude = [
  'docs/*',
  'noxfile.py'
-]
+]

tests/test_async_chat_store.py

@@ -92,6 +92,7 @@ async def async_engine(
  yield async_engine
 
  await async_engine.close()
+ await async_engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def chat_store(self, async_engine):

tests/test_async_document_store.py

@@ -90,6 +90,7 @@ async def async_engine(self, db_project, db_region, db_instance, db_name):
  yield async_engine
 
  await async_engine.close()
+ await async_engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def doc_store(self, async_engine):

tests/test_async_index_store.py

@@ -88,6 +88,7 @@ async def async_engine(self, db_project, db_region, db_instance, db_name):
  yield async_engine
 
  await async_engine.close()
+ await async_engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def index_store(self, async_engine):

tests/test_async_vector_store.py

@@ -113,6 +113,7 @@ async def engine(self, db_project, db_region, db_instance, db_name):
  await aexecute(engine, f'DROP TABLE IF EXISTS "{DEFAULT_TABLE}"')
  await aexecute(engine, f'DROP TABLE IF EXISTS "{DEFAULT_TABLE_CUSTOM_VS}"')
  await engine.close()
+ await engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def vs(self, engine):

tests/test_async_vector_store_index.py

@@ -99,6 +99,7 @@ async def engine(self, db_project, db_region, db_instance, db_name):
  yield engine
  await aexecute(engine, f"DROP TABLE IF EXISTS {DEFAULT_TABLE}")
  await engine.close()
+ await engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def vs(self, engine):

tests/test_chat_store.py

@@ -96,6 +96,7 @@ async def async_engine(self, db_project, db_region, db_instance, db_name):
  yield async_engine
 
  await async_engine.close()
+ await async_engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def async_chat_store(self, async_engine):
@@ -258,6 +259,7 @@ async def sync_engine(self, db_project, db_region, db_instance, db_name):
  yield sync_engine
 
  await sync_engine.close()
+ await sync_engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def sync_chat_store(self, sync_engine):

tests/test_document_store.py

@@ -102,6 +102,7 @@ async def async_engine(
  yield async_engine
 
  await async_engine.close()
+ await async_engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def doc_store(self, async_engine):
@@ -388,6 +389,7 @@ async def sync_engine(
  yield sync_engine
 
  await sync_engine.close()
+ await sync_engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def sync_doc_store(self, sync_engine):

tests/test_engine.py

@@ -118,6 +118,7 @@ async def engine(self, db_project, db_region, db_instance, db_name):
  await aexecute(engine, f'DROP TABLE IF EXISTS "{DEFAULT_IS_TABLE}"')
  await aexecute(engine, f'DROP TABLE IF EXISTS "{DEFAULT_CS_TABLE}"')
  await engine.close()
+ await engine._connector.close_async()
 
  async def test_password(
  self,
@@ -234,6 +235,7 @@ async def test_iam_account_override(
  assert engine
  await aexecute(engine, "SELECT 1")
  await engine.close()
+ await engine._connector.close_async()
 
  async def test_init_document_store(self, engine):
  await engine.ainit_doc_store_table(
@@ -365,6 +367,7 @@ async def engine(self, db_project, db_region, db_instance, db_name):
  await aexecute(engine, f'DROP TABLE IF EXISTS "{DEFAULT_VS_TABLE_SYNC}"')
  await aexecute(engine, f'DROP TABLE IF EXISTS "{DEFAULT_CS_TABLE_SYNC}"')
  await engine.close()
+ await engine._connector.close_async()
 
  async def test_init_with_constructor(
  self,
@@ -471,6 +474,7 @@ async def test_iam_account_override(
  assert engine
  await aexecute(engine, "SELECT 1")
  await engine.close()
+ await engine._connector.close_async()
 
  async def test_init_document_store(self, engine):
  engine.init_doc_store_table(

tests/test_index_store.py

@@ -96,6 +96,7 @@ async def async_engine(self, db_project, db_region, db_instance, db_name):
  yield async_engine
 
  await async_engine.close()
+ await async_engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def index_store(self, async_engine):
@@ -212,6 +213,7 @@ async def async_engine(self, db_project, db_region, db_instance, db_name):
  yield async_engine
 
  await async_engine.close()
+ await async_engine._connector.close_async()
 
  @pytest_asyncio.fixture(scope="class")
  async def index_store(self, async_engine):