Fixed tests after merge conflicts

Author: gkevinzheng

google/cloud/bigtable/backup.py

@@ -106,7 +106,7 @@ def name(self):
         if not self._cluster:
             raise ValueError('"cluster" parameter must be set')
 
-        return BaseBigtableTableAdminClient.backup_path(
+        return BigtableTableAdminClient.backup_path(
             project=self._instance._client.project,
             instance=self._instance.instance_id,
             cluster=self._cluster,
@@ -141,7 +141,7 @@ def parent(self):
         :returns: A full path to the parent cluster.
         """
         if not self._parent and self._cluster:
-            self._parent = BaseBigtableTableAdminClient.cluster_path(
+            self._parent = BigtableTableAdminClient.cluster_path(
                 project=self._instance._client.project,
                 instance=self._instance.instance_id,
                 cluster=self._cluster,
@@ -163,7 +163,7 @@ def source_table(self):
         :returns: The Table name.
         """
         if not self._source_table and self.table_id:
-            self._source_table = BaseBigtableTableAdminClient.table_path(
+            self._source_table = BigtableTableAdminClient.table_path(
                 project=self._instance._client.project,
                 instance=self._instance.instance_id,
                 table=self.table_id,
@@ -425,7 +425,7 @@ def restore(self, table_id, instance_id=None):
         """
         api = self._instance._client.table_admin_client
         if instance_id:
-            parent = BaseBigtableTableAdminClient.instance_path(
+            parent = BigtableTableAdminClient.instance_path(
                 project=self._instance._client.project,
                 instance=instance_id,
             )

tests/unit/v2_client/test_client.py

@@ -455,7 +455,7 @@ def test_client_table_admin_client_not_initialized_w_admin_flag():
     client = _make_client(project=PROJECT, credentials=credentials, admin=True)
 
     table_admin_client = client.table_admin_client
-    assert isinstance(table_admin_client, BaseBigtableTableAdminClient)
+    assert isinstance(table_admin_client, BigtableTableAdminClient)
     assert client._table_admin_client is table_admin_client
 
 
@@ -472,7 +472,7 @@ def test_client_table_admin_client_not_initialized_w_client_info():
     )
 
     table_admin_client = client.table_admin_client
-    assert isinstance(table_admin_client, BaseBigtableTableAdminClient)
+    assert isinstance(table_admin_client, BigtableTableAdminClient)
     assert client._client_info is client_info
     assert client._table_admin_client is table_admin_client
 

tests/unit/v2_client/test_column_family.py

@@ -357,7 +357,7 @@ def _create_test_helper(gc_rule=None):
         + table_id
     )
 
-    api = mock.create_autospec(BaseBigtableTableAdminClient)
+    api = mock.create_autospec(BigtableTableAdminClient)
 
     credentials = _make_credentials()
     client = _make_client(project=project_id, credentials=credentials, admin=True)
@@ -428,7 +428,7 @@ def _update_test_helper(gc_rule=None):
         + table_id
     )
 
-    api = mock.create_autospec(BaseBigtableTableAdminClient)
+    api = mock.create_autospec(BigtableTableAdminClient)
     credentials = _make_credentials()
     client = _make_client(project=project_id, credentials=credentials, admin=True)
     table = _Table(table_name, client=client)
@@ -499,7 +499,7 @@ def test_column_family_delete():
         + table_id
     )
 
-    api = mock.create_autospec(BaseBigtableTableAdminClient)
+    api = mock.create_autospec(BigtableTableAdminClient)
     credentials = _make_credentials()
     client = _make_client(project=project_id, credentials=credentials, admin=True)
     table = _Table(table_name, client=client)

tests/unit/v2_client/test_instance.py

@@ -816,7 +816,7 @@ def _list_tables_helper(table_name=None):
     instance_api = client._instance_admin_client = _make_instance_admin_api()
     instance_api.instance_path.return_value = "projects/project/instances/instance-id"
     table_api = client._table_admin_client = mock.create_autospec(
-        BaseBigtableTableAdminClient
+        BigtableTableAdminClient
     )
     if table_name is None:
         table_name = TABLE_NAME

tests/unit/v2_client/test_table.py

@@ -349,7 +349,7 @@ def _make_table_api():
         client as bigtable_table_admin,
     )
 
-    return mock.create_autospec(bigtable_table_admin.BaseBigtableTableAdminClient)
+    return mock.create_autospec(bigtable_table_admin.BigtableTableAdminClient)
 
 
 def _create_table_helper(split_keys=[], column_families={}):