cleaned up test setup

Author: daniel-sanche

tests/system/data/test_system_async.py

@@ -119,11 +119,14 @@ async def delete_rows(self):
 
 @CrossSync.convert_class(sync_name="TestSystem")
 class TestSystemAsync:
+    def _make_client(self):
+        project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
+        return CrossSync.DataClient(project=project)
+
     @CrossSync.convert
     @CrossSync.pytest_fixture(scope="session")
     async def client(self):
-        project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
-        async with CrossSync.DataClient(project=project) as client:
+        async with self._make_client() as client:
             yield client
 
     @CrossSync.convert
@@ -268,8 +271,7 @@ async def test_channel_refresh(self, table_id, instance_id, temp_rows):
         """
         await temp_rows.add_row(b"row_key_1")
         await temp_rows.add_row(b"row_key_2")
-        project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
-        client = CrossSync.DataClient(project=project)
+        client = self._make_client()
         # start custom refresh task
         try:
             client._channel_refresh_task = CrossSync.create_task(

tests/system/data/test_system_autogen.py

@@ -102,10 +102,13 @@ def delete_rows(self):
 
 
 class TestSystem:
+    def _make_client(self):
+        project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
+        return CrossSync._Sync_Impl.DataClient(project=project)
+
     @pytest.fixture(scope="session")
     def client(self):
-        project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
-        with CrossSync._Sync_Impl.DataClient(project=project) as client:
+        with self._make_client() as client:
             yield client
 
     @pytest.fixture(scope="session", params=TARGETS)
@@ -222,8 +225,7 @@ def test_channel_refresh(self, table_id, instance_id, temp_rows):
         to ensure new channel works"""
         temp_rows.add_row(b"row_key_1")
         temp_rows.add_row(b"row_key_2")
-        project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
-        client = CrossSync._Sync_Impl.DataClient(project=project)
+        client = self._make_client()
         try:
             client._channel_refresh_task = CrossSync._Sync_Impl.create_task(
                 client._manage_channel,