updated system test

Author: daniel-sanche

tests/system/data/test_system_async.py

@@ -285,23 +285,28 @@ async def test_channel_refresh(self, table_id, instance_id, temp_rows):
             async with client.get_table(instance_id, table_id) as table:
                 rows = await table.read_rows({})
                 channel_wrapper = client.transport.grpc_channel
-                first_channel = client.transport.grpc_channel._channel
+                first_channel = channel_wrapper._channel
                 assert len(rows) == 2
                 await CrossSync.sleep(2)
                 rows_after_refresh = await table.read_rows({})
                 assert len(rows_after_refresh) == 2
                 assert client.transport.grpc_channel is channel_wrapper
-                assert client.transport.grpc_channel._channel is not first_channel
-                # ensure gapic's logging interceptor is still active
+                updated_channel = channel_wrapper._channel
+                assert updated_channel is not first_channel
+                # ensure interceptors are kept (gapic's logging interceptor, and metric interceptor)
                 if CrossSync.is_async:
-                    interceptors = (
-                        client.transport.grpc_channel._channel._unary_unary_interceptors
-                    )
-                    assert GapicInterceptor in [type(i) for i in interceptors]
+                    unary_interceptors = updated_channel._unary_unary_interceptors
+                    assert len(unary_interceptors) == 2
+                    assert GapicInterceptor in [type(i) for i in unary_interceptors]
+                    assert client._metrics_interceptor in unary_interceptors
+                    stream_interceptors = updated_channel._unary_stream_interceptors
+                    assert len(stream_interceptors) == 1
+                    assert client._metrics_interceptor in stream_interceptors
                 else:
                     assert isinstance(
                         client.transport._logged_channel._interceptor, GapicInterceptor
                     )
+                    assert updated_channel._interceptor == client._metrics_interceptor
         finally:
             await client.close()
 

tests/system/data/test_system_autogen.py

@@ -237,16 +237,18 @@ def test_channel_refresh(self, table_id, instance_id, temp_rows):
             with client.get_table(instance_id, table_id) as table:
                 rows = table.read_rows({})
                 channel_wrapper = client.transport.grpc_channel
-                first_channel = client.transport.grpc_channel._channel
+                first_channel = channel_wrapper._channel
                 assert len(rows) == 2
                 CrossSync._Sync_Impl.sleep(2)
                 rows_after_refresh = table.read_rows({})
                 assert len(rows_after_refresh) == 2
                 assert client.transport.grpc_channel is channel_wrapper
-                assert client.transport.grpc_channel._channel is not first_channel
+                updated_channel = channel_wrapper._channel
+                assert updated_channel is not first_channel
                 assert isinstance(
                     client.transport._logged_channel._interceptor, GapicInterceptor
                 )
+                assert updated_channel._interceptor == client._metrics_interceptor
         finally:
             client.close()
 
@@ -258,7 +260,7 @@ def test_mutation_set_cell(self, target, 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(
             target, temp_rows, new_value=new_value
         )
         target.mutate_row(row_key, mutation)
@@ -312,7 +314,7 @@ 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 = self._create_row_and_mutation(
+        (row_key, mutation) = self._create_row_and_mutation(
             target, temp_rows, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
@@ -347,11 +349,11 @@ def test_mutations_batcher_context_manager(self, client, target, 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(
             target, temp_rows, new_value=new_value
         )
-        row_key2, mutation2 = self._create_row_and_mutation(
+        (row_key2, mutation2) = self._create_row_and_mutation(
             target, temp_rows, new_value=new_value2
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
@@ -372,7 +374,7 @@ 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 = self._create_row_and_mutation(
+        (row_key, mutation) = self._create_row_and_mutation(
             target, temp_rows, new_value=new_value
         )
         bulk_mutation = RowMutationEntry(row_key, [mutation])
@@ -394,12 +396,12 @@ def test_mutations_batcher_count_flush(self, client, target, 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(
             target, 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(
             target, temp_rows, new_value=new_value2
         )
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])
@@ -426,12 +428,12 @@ def test_mutations_batcher_bytes_flush(self, client, target, 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(
             target, 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(
             target, temp_rows, new_value=new_value2
         )
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])
@@ -457,11 +459,11 @@ def test_mutations_batcher_no_flush(self, client, target, 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(
             target, 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(
             target, temp_rows, start_value=start_value, new_value=new_value
         )
         bulk_mutation2 = RowMutationEntry(row_key2, [mutation2])