fixed unit tests

Author: daniel-sanche

tests/unit/data/_metrics/test_data_model.py

@@ -535,16 +535,6 @@ def test_end_with_status_w_exception(self):
             final_op = handlers[0].on_operation_complete.call_args[0][0]
             assert final_op.final_status == expected_status
 
-    def test_interceptor_metadata(self):
-        from google.cloud.bigtable.data._metrics.data_model import (
-            OPERATION_INTERCEPTOR_METADATA_KEY,
-        )
-
-        metric = self._make_one(mock.Mock())
-        key, value = metric.interceptor_metadata
-        assert key == OPERATION_INTERCEPTOR_METADATA_KEY
-        assert value == metric.uuid
-
     def test_end_with_status_with_default_cluster_zone(self):
         """
         ending the operation should use default cluster and zone if not set

tests/unit/data/_metrics/test_metrics_controller.py

@@ -21,19 +21,13 @@ def _make_one(self, *args, **kwargs):
             BigtableClientSideMetricsController,
         )
 
-        # add mock interceptor if called with no arguments
-        if not args and "interceptor" not in kwargs:
-            args = [mock.Mock()]
-
         return BigtableClientSideMetricsController(*args, **kwargs)
 
     def test_ctor_defaults(self):
         """
         should create instance with GCP Exporter handler by default
         """
-        expected_interceptor = object()
-        instance = self._make_one(expected_interceptor)
-        assert instance.interceptor == expected_interceptor
+        instance = self._make_one()
         assert len(instance.handlers) == 0
 
     def ctor_custom_handlers(self):
@@ -92,22 +86,4 @@ def test_create_operation(self):
         assert op.is_streaming is expected_is_streaming
         assert op.zone is expected_zone
         assert len(op.handlers) == 1
-        assert op.handlers[0] is handler
-
-    def test_create_operation_registers_interceptor(self):
-        """
-        creating an operation should link the operation with the controller's interceptor,
-        and add the interceptor as a handler to the operation
-        """
-        from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
-            BigtableMetricsInterceptor,
-        )
-
-        custom_handler = object()
-        controller = self._make_one(
-            BigtableMetricsInterceptor(), handlers=[custom_handler]
-        )
-        op = controller.create_operation(object())
-        assert custom_handler in op.handlers
-        assert op.uuid in controller.interceptor.operation_map
-        assert controller.interceptor.operation_map[op.uuid] == op
+        assert op.handlers[0] is handler