refactored system tests

Author: daniel-sanche

tests/system/data/test_system_async.py

@@ -116,6 +116,39 @@ async def delete_rows(self):
             }
             await self.target.client._gapic_client.mutate_rows(request)
 
+    @CrossSync.convert
+    async def retrieve_cell_value(self, target, row_key):
+        """
+        Helper to read an individual row
+        """
+        from google.cloud.bigtable.data import ReadRowsQuery
+
+        row_list = await target.read_rows(ReadRowsQuery(row_keys=row_key))
+        assert len(row_list) == 1
+        row = row_list[0]
+        cell = row.cells[0]
+        return cell.value
+
+    @CrossSync.convert
+    async def create_row_and_mutation(
+        self, table,  *, start_value=b"start", new_value=b"new_value"
+    ):
+        """
+        Helper to create a new row, and a sample set_cell mutation to change its value
+        """
+        from google.cloud.bigtable.data.mutations import SetCell
+
+        row_key = uuid.uuid4().hex.encode()
+        family = TEST_FAMILY
+        qualifier = b"test-qualifier"
+        await self.add_row(
+            row_key, family=family, qualifier=qualifier, value=start_value
+        )
+        # ensure cell is initialized
+        assert await self.retrieve_cell_value(table, row_key) == start_value
+
+        mutation = SetCell(family=TEST_FAMILY, qualifier=qualifier, new_value=new_value)
+        return row_key, mutation
 
 @CrossSync.convert_class(sync_name="TestSystem")
 class TestSystemAsync(SystemTestRunner):
@@ -148,41 +181,6 @@ async def target(self, client, table_id, authorized_view_id, instance_id, reques
         else:
             raise ValueError(f"unknown target type: {request.param}")
 
-    @CrossSync.convert
-    @pytest.mark.usefixtures("target")
-    async def _retrieve_cell_value(self, target, row_key):
-        """
-        Helper to read an individual row
-        """
-        from google.cloud.bigtable.data import ReadRowsQuery
-
-        row_list = await target.read_rows(ReadRowsQuery(row_keys=row_key))
-        assert len(row_list) == 1
-        row = row_list[0]
-        cell = row.cells[0]
-        return cell.value
-
-    @CrossSync.convert
-    async def _create_row_and_mutation(
-        self, table, temp_rows, *, start_value=b"start", new_value=b"new_value"
-    ):
-        """
-        Helper to create a new row, and a sample set_cell mutation to change its value
-        """
-        from google.cloud.bigtable.data.mutations import SetCell
-
-        row_key = uuid.uuid4().hex.encode()
-        family = TEST_FAMILY
-        qualifier = b"test-qualifier"
-        await temp_rows.add_row(
-            row_key, family=family, qualifier=qualifier, value=start_value
-        )
-        # ensure cell is initialized
-        assert await self._retrieve_cell_value(table, row_key) == start_value
-
-        mutation = SetCell(family=TEST_FAMILY, qualifier=qualifier, new_value=new_value)
-        return row_key, mutation
-
     @CrossSync.convert
     @CrossSync.pytest_fixture(scope="function")
     async def temp_rows(self, target):
@@ -280,13 +278,13 @@ async def test_mutation_set_cell(self, target, temp_rows):
         """
         row_key = b"bulk_mutate"
         new_value = uuid.uuid4().hex.encode()
-        row_key, mutation = await self._create_row_and_mutation(
-            target, temp_rows, new_value=new_value
+        row_key, mutation = await temp_rows.create_row_and_mutation(
+            target, new_value=new_value
         )
         await target.mutate_row(row_key, mutation)
 
         # ensure cell is updated
-        assert (await self._retrieve_cell_value(target, row_key)) == new_value
+        assert (await temp_rows.retrieve_cell_value(target, row_key)) == new_value
 
     @CrossSync.pytest
     @pytest.mark.usefixtures("target")
@@ -308,14 +306,14 @@ async def test_mutation_add_to_cell(self, target, temp_rows):
         await target.mutate_row(
             row_key, AddToCell(family, qualifier, 1, timestamp_micros=0)
         )
-        encoded_result = await self._retrieve_cell_value(target, row_key)
+        encoded_result = await temp_rows.retrieve_cell_value(target, row_key)
         int_result = int.from_bytes(encoded_result, byteorder="big")
         assert int_result == 1
         # update again
         await target.mutate_row(
             row_key, AddToCell(family, qualifier, 9, timestamp_micros=0)
         )
-        encoded_result = await self._retrieve_cell_value(target, row_key)
+        encoded_result = await temp_rows.retrieve_cell_value(target, row_key)
         int_result = int.from_bytes(encoded_result, byteorder="big")
         assert int_result == 10
 
@@ -357,15 +355,15 @@ async def test_bulk_mutations_set_cell(self, client, target, temp_rows):
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
         new_value = uuid.uuid4().hex.encode()
-        row_key, mutation = await self._create_row_and_mutation(
-            target, temp_rows, new_value=new_value
+        row_key, mutation = await temp_rows.create_row_and_mutation(
+            target, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
 
         await target.bulk_mutate_rows([bulk_mutation])
 
         # ensure cell is updated
-        assert (await self._retrieve_cell_value(target, row_key)) == new_value
+        assert (await temp_rows.retrieve_cell_value(target, row_key)) == new_value
 
     @CrossSync.pytest
     async def test_bulk_mutations_raise_exception(self, client, target):
@@ -403,11 +401,11 @@ async def test_mutations_batcher_context_manager(self, client, target, temp_rows
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
         new_value, new_value2 = [uuid.uuid4().hex.encode() for _ in range(2)]
-        row_key, mutation = await self._create_row_and_mutation(
-            target, temp_rows, new_value=new_value
+        row_key, mutation = await temp_rows.create_row_and_mutation(
+            target, new_value=new_value
         )
-        row_key2, mutation2 = await self._create_row_and_mutation(
-            target, temp_rows, new_value=new_value2
+        row_key2, mutation2 = await temp_rows.create_row_and_mutation(
+            target, new_value=new_value2
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])
@@ -416,7 +414,7 @@ async def test_mutations_batcher_context_manager(self, client, target, temp_rows
             await batcher.append(bulk_mutation)
             await batcher.append(bulk_mutation2)
         # ensure cell is updated
-        assert (await self._retrieve_cell_value(target, row_key)) == new_value
+        assert (await temp_rows.retrieve_cell_value(target, row_key)) == new_value
         assert len(batcher._staged_entries) == 0
 
     @pytest.mark.usefixtures("client")
@@ -432,8 +430,8 @@ async def test_mutations_batcher_timer_flush(self, client, target, temp_rows):
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
         new_value = uuid.uuid4().hex.encode()
-        row_key, mutation = await self._create_row_and_mutation(
-            target, temp_rows, new_value=new_value
+        row_key, mutation = await temp_rows.create_row_and_mutation(
+            target, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
         flush_interval = 0.1
@@ -444,7 +442,7 @@ async def test_mutations_batcher_timer_flush(self, client, target, temp_rows):
             await CrossSync.sleep(flush_interval + 0.1)
             assert len(batcher._staged_entries) == 0
             # ensure cell is updated
-            assert (await self._retrieve_cell_value(target, row_key)) == new_value
+            assert (await temp_rows.retrieve_cell_value(target, row_key)) == new_value
 
     @pytest.mark.usefixtures("client")
     @pytest.mark.usefixtures("target")
@@ -459,12 +457,12 @@ async def test_mutations_batcher_count_flush(self, client, target, temp_rows):
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
         new_value, new_value2 = [uuid.uuid4().hex.encode() for _ in range(2)]
-        row_key, mutation = await self._create_row_and_mutation(
-            target, temp_rows, new_value=new_value
+        row_key, mutation = await temp_rows.create_row_and_mutation(
+            target, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
-        row_key2, mutation2 = await self._create_row_and_mutation(
-            target, temp_rows, new_value=new_value2
+        row_key2, mutation2 = await temp_rows.create_row_and_mutation(
+            target, new_value=new_value2
         )
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])
 
@@ -484,8 +482,8 @@ async def test_mutations_batcher_count_flush(self, client, target, temp_rows):
             assert len(batcher._staged_entries) == 0
             assert len(batcher._flush_jobs) == 0
             # ensure cells were updated
-            assert (await self._retrieve_cell_value(target, row_key)) == new_value
-            assert (await self._retrieve_cell_value(target, row_key2)) == new_value2
+            assert (await temp_rows.retrieve_cell_value(target, row_key)) == new_value
+            assert (await temp_rows.retrieve_cell_value(target, row_key2)) == new_value2
 
     @pytest.mark.usefixtures("client")
     @pytest.mark.usefixtures("target")
@@ -500,12 +498,12 @@ async def test_mutations_batcher_bytes_flush(self, client, target, temp_rows):
         from google.cloud.bigtable.data.mutations import RowMutationEntry
 
         new_value, new_value2 = [uuid.uuid4().hex.encode() for _ in range(2)]
-        row_key, mutation = await self._create_row_and_mutation(
-            target, temp_rows, new_value=new_value
+        row_key, mutation = await temp_rows.create_row_and_mutation(
+            target, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
-        row_key2, mutation2 = await self._create_row_and_mutation(
-            target, temp_rows, new_value=new_value2
+        row_key2, mutation2 = await temp_rows.create_row_and_mutation(
+            target, new_value=new_value2
         )
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])
 
@@ -525,8 +523,8 @@ async def test_mutations_batcher_bytes_flush(self, client, target, temp_rows):
                 # for sync version: grab result
                 future.result()
             # ensure cells were updated
-            assert (await self._retrieve_cell_value(target, row_key)) == new_value
-            assert (await self._retrieve_cell_value(target, row_key2)) == new_value2
+            assert (await temp_rows.retrieve_cell_value(target, row_key)) == new_value
+            assert (await temp_rows.retrieve_cell_value(target, row_key2)) == new_value2
 
     @pytest.mark.usefixtures("client")
     @pytest.mark.usefixtures("target")
@@ -539,12 +537,12 @@ async def test_mutations_batcher_no_flush(self, client, target, temp_rows):
 
         new_value = uuid.uuid4().hex.encode()
         start_value = b"unchanged"
-        row_key, mutation = await self._create_row_and_mutation(
-            target, temp_rows, start_value=start_value, new_value=new_value
+        row_key, mutation = await temp_rows.create_row_and_mutation(
+            target, start_value=start_value, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
-        row_key2, mutation2 = await self._create_row_and_mutation(
-            target, temp_rows, start_value=start_value, new_value=new_value
+        row_key2, mutation2 = await temp_rows.create_row_and_mutation(
+            target, start_value=start_value, new_value=new_value
         )
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])
 
@@ -561,8 +559,8 @@ async def test_mutations_batcher_no_flush(self, client, target, temp_rows):
             assert len(batcher._staged_entries) == 2
             assert len(batcher._flush_jobs) == 0
             # ensure cells were not updated
-            assert (await self._retrieve_cell_value(target, row_key)) == start_value
-            assert (await self._retrieve_cell_value(target, row_key2)) == start_value
+            assert (await temp_rows.retrieve_cell_value(target, row_key)) == start_value
+            assert (await temp_rows.retrieve_cell_value(target, row_key2)) == start_value
 
     @pytest.mark.usefixtures("client")
     @pytest.mark.usefixtures("target")
@@ -633,7 +631,7 @@ async def test_read_modify_write_row_increment(
         assert result[0].qualifier == qualifier
         assert int(result[0]) == expected
         # ensure that reading from server gives same value
-        assert (await self._retrieve_cell_value(target, row_key)) == result[0].value
+        assert (await temp_rows.retrieve_cell_value(target, row_key)) == result[0].value
 
     @pytest.mark.usefixtures("client")
     @pytest.mark.usefixtures("target")
@@ -673,7 +671,7 @@ async def test_read_modify_write_row_append(
         assert result[0].qualifier == qualifier
         assert result[0].value == expected
         # ensure that reading from server gives same value
-        assert (await self._retrieve_cell_value(target, row_key)) == result[0].value
+        assert (await temp_rows.retrieve_cell_value(target, row_key)) == result[0].value
 
     @pytest.mark.usefixtures("client")
     @pytest.mark.usefixtures("target")
@@ -710,7 +708,7 @@ async def test_read_modify_write_row_chained(self, client, target, temp_rows):
             + b"helloworld!"
         )
         # ensure that reading from server gives same value
-        assert (await self._retrieve_cell_value(target, row_key)) == result[0].value
+        assert (await temp_rows.retrieve_cell_value(target, row_key)) == result[0].value
 
     @pytest.mark.usefixtures("client")
     @pytest.mark.usefixtures("target")
@@ -759,7 +757,7 @@ async def test_check_and_mutate(
         expected_value = (
             true_mutation_value if expected_result else false_mutation_value
         )
-        assert (await self._retrieve_cell_value(target, row_key)) == expected_value
+        assert (await temp_rows.retrieve_cell_value(target, row_key)) == expected_value
 
     @pytest.mark.skipif(
         bool(os.environ.get(BIGTABLE_EMULATOR)),