Fixed system test failure at the end of a test run

Author: gkevinzheng

tests/system/admin_overlay/conftest.py

@@ -23,7 +23,7 @@
 @pytest.fixture(scope="session")
 def admin_overlay_project_id():
     _, default_project = google.auth.default()
-    yield os.getenv("ADMIN_TEST_PROJECT") or default_project
+    yield os.getenv("GOOGLE_CLOUD_PROJECT") or default_project
 
 
 def generate_unique_suffix(name):

tests/system/admin_overlay/test_system_async.py

@@ -36,7 +36,6 @@
 
 from datetime import datetime, timedelta
 
-import asyncio
 import pytest
 
 
@@ -49,16 +48,6 @@
 __CROSS_SYNC_OUTPUT__ = "tests.system.admin_overlay.test_system_autogen"
 
 
-@CrossSync.drop
-@pytest.fixture(scope="session")
-def event_loop():
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-    yield loop
-    loop.stop()
-    loop.close()
-
-
 @CrossSync.convert
 @CrossSync.pytest_fixture(scope="session")
 async def data_client(admin_overlay_project_id):

tests/system/conftest.py

@@ -17,9 +17,20 @@
 import sys
 import os
 
+import pytest
+import asyncio
+
 script_path = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(script_path)
 
 pytest_plugins = [
     "data.setup_fixtures",
 ]
+
+
+@pytest.fixture(scope="session")
+def event_loop():
+    loop = asyncio.get_event_loop()
+    yield loop
+    loop.stop()
+    loop.close()

tests/system/data/test_system_async.py

@@ -98,13 +98,6 @@ async def table(self, client, table_id, instance_id):
         async with client.get_table(instance_id, table_id) as table:
             yield table
 
-    @CrossSync.drop
-    @pytest.fixture(scope="session")
-    def event_loop(self):
-        loop = asyncio.get_event_loop()
-        yield loop
-        loop.stop()
-        loop.close()
 
     @pytest.fixture(scope="session")
     def column_family_config(self):

tests/system/data/test_system_autogen.py

@@ -200,7 +200,7 @@ def test_mutation_set_cell(self, table, temp_rows):
         """Ensure cells can be set properly"""
         row_key = b"bulk_mutate"
         new_value = uuid.uuid4().hex.encode()
-        (row_key, mutation) = self._create_row_and_mutation(
+        row_key, mutation = self._create_row_and_mutation(
             table, temp_rows, new_value=new_value
         )
         table.mutate_row(row_key, mutation)
@@ -233,7 +233,7 @@ def test_bulk_mutations_set_cell(self, client, table, temp_rows):
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
         new_value = uuid.uuid4().hex.encode()
-        (row_key, mutation) = self._create_row_and_mutation(
+        row_key, mutation = self._create_row_and_mutation(
             table, temp_rows, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
@@ -268,11 +268,11 @@ def test_mutations_batcher_context_manager(self, client, table, temp_rows):
         """test batcher with context manager. Should flush on exit"""
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
-        (new_value, new_value2) = [uuid.uuid4().hex.encode() for _ in range(2)]
-        (row_key, mutation) = self._create_row_and_mutation(
+        new_value, new_value2 = [uuid.uuid4().hex.encode() for _ in range(2)]
+        row_key, mutation = self._create_row_and_mutation(
             table, temp_rows, new_value=new_value
         )
-        (row_key2, mutation2) = self._create_row_and_mutation(
+        row_key2, mutation2 = self._create_row_and_mutation(
             table, temp_rows, new_value=new_value2
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
@@ -293,7 +293,7 @@ def test_mutations_batcher_timer_flush(self, client, table, temp_rows):
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
         new_value = uuid.uuid4().hex.encode()
-        (row_key, mutation) = self._create_row_and_mutation(
+        row_key, mutation = self._create_row_and_mutation(
             table, temp_rows, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
@@ -315,12 +315,12 @@ def test_mutations_batcher_count_flush(self, client, table, temp_rows):
         """batch should flush after flush_limit_mutation_count mutations"""
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
-        (new_value, new_value2) = [uuid.uuid4().hex.encode() for _ in range(2)]
-        (row_key, mutation) = self._create_row_and_mutation(
+        new_value, new_value2 = [uuid.uuid4().hex.encode() for _ in range(2)]
+        row_key, mutation = self._create_row_and_mutation(
             table, temp_rows, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
-        (row_key2, mutation2) = self._create_row_and_mutation(
+        row_key2, mutation2 = self._create_row_and_mutation(
             table, temp_rows, new_value=new_value2
         )
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])
@@ -347,12 +347,12 @@ def test_mutations_batcher_bytes_flush(self, client, table, temp_rows):
         """batch should flush after flush_limit_bytes bytes"""
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
-        (new_value, new_value2) = [uuid.uuid4().hex.encode() for _ in range(2)]
-        (row_key, mutation) = self._create_row_and_mutation(
+        new_value, new_value2 = [uuid.uuid4().hex.encode() for _ in range(2)]
+        row_key, mutation = self._create_row_and_mutation(
             table, temp_rows, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
-        (row_key2, mutation2) = self._create_row_and_mutation(
+        row_key2, mutation2 = self._create_row_and_mutation(
             table, temp_rows, new_value=new_value2
         )
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])
@@ -378,11 +378,11 @@ def test_mutations_batcher_no_flush(self, client, table, temp_rows):
 
         new_value = uuid.uuid4().hex.encode()
         start_value = b"unchanged"
-        (row_key, mutation) = self._create_row_and_mutation(
+        row_key, mutation = self._create_row_and_mutation(
             table, temp_rows, start_value=start_value, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
-        (row_key2, mutation2) = self._create_row_and_mutation(
+        row_key2, mutation2 = self._create_row_and_mutation(
             table, temp_rows, start_value=start_value, new_value=new_value
         )
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])