got tests to run

Author: daniel-sanche

tests/system/data/__init__.py

@@ -13,7 +13,67 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+import asyncio
+import pytest
+import uuid
+from google.cloud.bigtable.data._cross_sync import CrossSync
 
 TEST_FAMILY = "test-family"
 TEST_FAMILY_2 = "test-family-2"
 TEST_AGGREGATE_FAMILY = "test-aggregate-family"
+
+class SystemTestRunner:
+    """
+    configures a system test class with configuration for clusters/tables/etc
+
+    used by standard system tests, and metrics tests
+    """
+
+    @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 init_table_id(self):
+        """
+        The table_id to use when creating a new test table
+        """
+        return f"test-table-{uuid.uuid4().hex}"
+
+    @pytest.fixture(scope="session")
+    def cluster_config(self, project_id):
+        """
+        Configuration for the clusters to use when creating a new instance
+        """
+        from google.cloud.bigtable_admin_v2 import types
+
+        cluster = {
+            "test-cluster": types.Cluster(
+                location=f"projects/{project_id}/locations/us-central1-b",
+                serve_nodes=1,
+            )
+        }
+        return cluster
+
+    @pytest.fixture(scope="session")
+    def column_family_config(self):
+        """
+        specify column families to create when creating a new test table
+        """
+        from google.cloud.bigtable_admin_v2 import types
+
+        int_aggregate_type = types.Type.Aggregate(
+            input_type=types.Type(int64_type={"encoding": {"big_endian_bytes": {}}}),
+            sum={},
+        )
+        return {
+            TEST_FAMILY: types.ColumnFamily(),
+            TEST_FAMILY_2: types.ColumnFamily(),
+            TEST_AGGREGATE_FAMILY: types.ColumnFamily(
+                value_type=types.Type(aggregate_type=int_aggregate_type)
+            ),
+        }

tests/system/data/test_metrics_async.py

@@ -22,7 +22,7 @@
 from google.cloud.bigtable.data._cross_sync import CrossSync
 
 
-from . import TEST_FAMILY
+from . import TEST_FAMILY, SystemTestRunner
 
 __CROSS_SYNC_OUTPUT__ = "tests.system.data.test_metrics_autogen"
 
@@ -54,48 +54,12 @@ def clear(self):
         self.completed_operations.clear()
         self.completed_attempts.clear()
 
+    def __repr__(self):
+        return f"{self.__class__}(completed_operations={len(self.completed_operations)}, cancelled_operations={len(self.cancelled_operations)}, completed_attempts={len(self.completed_attempts)}"
 
-@CrossSync.convert_class(sync_name="TestSystem")
-class TestMetricsAsync:
 
-    @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 init_table_id(self):
-        """
-        The table_id to use when creating a new test table
-        """
-        return f"test-metrics-{uuid.uuid4().hex}"
-
-    @pytest.fixture(scope="session")
-    def cluster_config(self, project_id):
-        """
-        Configuration for the clusters to use when creating a new instance
-        """
-        from google.cloud.bigtable_admin_v2 import types
-
-        cluster = {
-            "test-cluster": types.Cluster(
-                location=f"projects/{project_id}/locations/us-central1-b",
-                serve_nodes=1,
-            )
-        }
-        return cluster
-
-    @pytest.fixture(scope="session")
-    def column_family_config(self):
-        """
-        specify column families to create when creating a new test table
-        """
-        from google.cloud.bigtable_admin_v2 import types
-
-        return {TEST_FAMILY: types.ColumnFamily()}
+@CrossSync.convert_class(sync_name="TestMetrics")
+class TestMetricsAsync(SystemTestRunner):
 
     def _make_client(self):
         project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
@@ -136,7 +100,8 @@ async def target(self, client, table_id, instance_id, handler):
             table._metrics.add_handler(handler)
             yield table
 
-    async def test_read_modify_write(self, target, temp_rows):
+    @CrossSync.pytest
+    async def test_read_modify_write(self, target, temp_rows, handler):
         from google.cloud.bigtable.data.read_modify_write_rules import IncrementRule
 
         row_key = b"test-row-key"
@@ -146,6 +111,12 @@ async def test_read_modify_write(self, target, temp_rows):
             row_key, value=0, family=family, qualifier=qualifier
         )
         rule = IncrementRule(family, qualifier, 1)
-        result = await target.read_modify_write_row(row_key, rule)
+        await target.read_modify_write_row(row_key, rule)
         breakpoint()
-        print(result)
+        assert handler.total() == 1
+        assert len(handler.completed_operations) == 1
+        assert len(handler.completed_attempts) == 1
+        assert len(handler.cancelled_operations) == 0
+        operation = handler.completed_operations[0]
+        assert operation.final_status.value[0] == 0
+        assert operation.final_status.value[0] == 0

tests/system/data/test_system_async.py

@@ -27,7 +27,7 @@
 
 from google.cloud.bigtable.data._cross_sync import CrossSync
 
-from . import TEST_FAMILY, TEST_FAMILY_2, TEST_AGGREGATE_FAMILY
+from . import TEST_FAMILY, TEST_FAMILY_2, TEST_AGGREGATE_FAMILY, SystemTestRunner
 
 if CrossSync.is_async:
     from google.cloud.bigtable_v2.services.bigtable.transports.grpc_asyncio import (
@@ -119,7 +119,7 @@ async def delete_rows(self):
 
 
 @CrossSync.convert_class(sync_name="TestSystem")
-class TestSystemAsync:
+class TestSystemAsync(SystemTestRunner):
     @CrossSync.convert
     @CrossSync.pytest_fixture(scope="session")
     async def client(self):
@@ -146,55 +146,6 @@ async def target(self, client, table_id, authorized_view_id, instance_id, reques
         else:
             raise ValueError(f"unknown target type: {request.param}")
 
-    @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):
-        """
-        specify column families to create when creating a new test table
-        """
-        from google.cloud.bigtable_admin_v2 import types
-
-        int_aggregate_type = types.Type.Aggregate(
-            input_type=types.Type(int64_type={"encoding": {"big_endian_bytes": {}}}),
-            sum={},
-        )
-        return {
-            TEST_FAMILY: types.ColumnFamily(),
-            TEST_FAMILY_2: types.ColumnFamily(),
-            TEST_AGGREGATE_FAMILY: types.ColumnFamily(
-                value_type=types.Type(aggregate_type=int_aggregate_type)
-            ),
-        }
-
-    @pytest.fixture(scope="session")
-    def init_table_id(self):
-        """
-        The table_id to use when creating a new test table
-        """
-        return f"test-table-{uuid.uuid4().hex}"
-
-    @pytest.fixture(scope="session")
-    def cluster_config(self, project_id):
-        """
-        Configuration for the clusters to use when creating a new instance
-        """
-        from google.cloud.bigtable_admin_v2 import types
-
-        cluster = {
-            "test-cluster": types.Cluster(
-                location=f"projects/{project_id}/locations/us-central1-b",
-                serve_nodes=1,
-            )
-        }
-        return cluster
-
     @CrossSync.convert
     @pytest.mark.usefixtures("target")
     async def _retrieve_cell_value(self, target, row_key):