Skip to content

Commit b3f96f6

Browse files
chalmerloweparthea
authored andcommitted
fix(bigtable): use dynamic request path in test helpers to support authorized views
1 parent 5f0b115 commit b3f96f6

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

packages/google-cloud-bigtable/tests/system/data/test_system_async.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
import pytest
2020
from google.api_core import retry
2121
from google.api_core.exceptions import ClientError, PermissionDenied
22-
from google.cloud.environment_vars import BIGTABLE_EMULATOR
23-
from google.type import date_pb2
24-
2522
from google.cloud.bigtable.data._cross_sync import CrossSync
2623
from google.cloud.bigtable.data.execute_query.metadata import SqlType
2724
from google.cloud.bigtable.data.read_modify_write_rules import _MAX_INCREMENT_VALUE
25+
from google.cloud.environment_vars import BIGTABLE_EMULATOR
26+
from google.type import date_pb2
2827

2928
from . import TEST_AGGREGATE_FAMILY, TEST_FAMILY, TEST_FAMILY_2, SystemTestRunner
3029

@@ -68,7 +67,7 @@ async def add_row(
6867
elif isinstance(value, int):
6968
value = value.to_bytes(8, byteorder="big", signed=True)
7069
request = {
71-
"table_name": self.target.table_name,
70+
**self.target._request_path,
7271
"row_key": row_key,
7372
"mutations": [
7473
{
@@ -88,7 +87,7 @@ async def add_aggregate_row(
8887
self, row_key, *, family=TEST_AGGREGATE_FAMILY, qualifier=b"q", input=0
8988
):
9089
request = {
91-
"table_name": self.target.table_name,
90+
**self.target._request_path,
9291
"row_key": row_key,
9392
"mutations": [
9493
{

packages/google-cloud-bigtable/tests/system/data/test_system_autogen.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222
import pytest
2323
from google.api_core import retry
2424
from google.api_core.exceptions import ClientError, PermissionDenied
25-
from google.cloud.environment_vars import BIGTABLE_EMULATOR
26-
from google.type import date_pb2
27-
2825
from google.cloud.bigtable.data._cross_sync import CrossSync
2926
from google.cloud.bigtable.data.execute_query.metadata import SqlType
3027
from google.cloud.bigtable.data.read_modify_write_rules import _MAX_INCREMENT_VALUE
3128
from google.cloud.bigtable_v2.services.bigtable.transports.grpc import (
3229
_LoggingClientInterceptor as GapicInterceptor,
3330
)
31+
from google.cloud.environment_vars import BIGTABLE_EMULATOR
32+
from google.type import date_pb2
3433

3534
from . import TEST_AGGREGATE_FAMILY, TEST_FAMILY, TEST_FAMILY_2, SystemTestRunner
3635

@@ -57,7 +56,7 @@ def add_row(
5756
elif isinstance(value, int):
5857
value = value.to_bytes(8, byteorder="big", signed=True)
5958
request = {
60-
"table_name": self.target.table_name,
59+
**self.target._request_path,
6160
"row_key": row_key,
6261
"mutations": [
6362
{
@@ -76,7 +75,7 @@ def add_aggregate_row(
7675
self, row_key, *, family=TEST_AGGREGATE_FAMILY, qualifier=b"q", input=0
7776
):
7877
request = {
79-
"table_name": self.target.table_name,
78+
**self.target._request_path,
8079
"row_key": row_key,
8180
"mutations": [
8281
{

0 commit comments

Comments
 (0)