Skip to content

Commit 71efcb6

Browse files
test: Unskipped wait_for_consistency system tests in emulator (#1186)
* test: Unskipped wait_for_consistency system tests in emulator * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Added sync surface * Actual sync surface * Used pytest.mark.skipif --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 451fd97 commit 71efcb6

File tree

2 files changed

+45
-25
lines changed

2 files changed

+45
-25
lines changed

tests/system/admin_overlay/test_system_async.py

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,27 @@ async def create_instance(
143143
default_storage_type=storage_type,
144144
)
145145

146-
create_instance_request = admin_v2.CreateInstanceRequest(
147-
parent=instance_admin_client.common_project_path(project_id),
148-
instance_id=instance_id,
149-
instance=admin_v2.Instance(
150-
display_name=instance_id[
151-
:30
152-
], # truncate to 30 characters because of character limit
153-
),
154-
clusters=clusters,
155-
)
156-
operation = await instance_admin_client.create_instance(create_instance_request)
157-
instance = await operation.result()
146+
# Instance and cluster creation are currently unsupported in the Bigtable emulator
147+
if os.getenv(BIGTABLE_EMULATOR):
148+
# All we need for system tests so far is the instance name.
149+
instance = admin_v2.Instance(
150+
name=instance_admin_client.instance_path(project_id, instance_id),
151+
)
152+
else:
153+
create_instance_request = admin_v2.CreateInstanceRequest(
154+
parent=instance_admin_client.common_project_path(project_id),
155+
instance_id=instance_id,
156+
instance=admin_v2.Instance(
157+
display_name=instance_id[
158+
:30
159+
], # truncate to 30 characters because of character limit
160+
),
161+
clusters=clusters,
162+
)
163+
operation = await instance_admin_client.create_instance(create_instance_request)
164+
instance = await operation.result()
158165

159-
instances_to_delete.append(instance)
166+
instances_to_delete.append(instance)
160167

161168
# Create a table within the instance
162169
create_table_request = admin_v2.CreateTableRequest(
@@ -272,6 +279,10 @@ async def assert_table_cell_value_equal_to(
272279
}
273280
)
274281
@CrossSync.pytest
282+
@pytest.mark.skipif(
283+
os.getenv(BIGTABLE_EMULATOR),
284+
reason="Backups are not supported in the Bigtable emulator",
285+
)
275286
@pytest.mark.parametrize(
276287
"second_instance_storage_type,expect_optimize_operation",
277288
[

tests/system/admin_overlay/test_system_autogen.py

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,20 @@ def create_instance(
113113
location=instance_admin_client.common_location_path(project_id, location),
114114
default_storage_type=storage_type,
115115
)
116-
create_instance_request = admin_v2.CreateInstanceRequest(
117-
parent=instance_admin_client.common_project_path(project_id),
118-
instance_id=instance_id,
119-
instance=admin_v2.Instance(display_name=instance_id[:30]),
120-
clusters=clusters,
121-
)
122-
operation = instance_admin_client.create_instance(create_instance_request)
123-
instance = operation.result()
124-
instances_to_delete.append(instance)
116+
if os.getenv(BIGTABLE_EMULATOR):
117+
instance = admin_v2.Instance(
118+
name=instance_admin_client.instance_path(project_id, instance_id)
119+
)
120+
else:
121+
create_instance_request = admin_v2.CreateInstanceRequest(
122+
parent=instance_admin_client.common_project_path(project_id),
123+
instance_id=instance_id,
124+
instance=admin_v2.Instance(display_name=instance_id[:30]),
125+
clusters=clusters,
126+
)
127+
operation = instance_admin_client.create_instance(create_instance_request)
128+
instance = operation.result()
129+
instances_to_delete.append(instance)
125130
create_table_request = admin_v2.CreateTableRequest(
126131
parent=instance_admin_client.instance_path(project_id, instance_id),
127132
table_id=TEST_TABLE_NAME,
@@ -201,6 +206,10 @@ def assert_table_cell_value_equal_to(
201206
assert latest_cell.value.decode("utf-8") == value
202207

203208

209+
@pytest.mark.skipif(
210+
os.getenv(BIGTABLE_EMULATOR),
211+
reason="Backups are not supported in the Bigtable emulator",
212+
)
204213
@pytest.mark.parametrize(
205214
"second_instance_storage_type,expect_optimize_operation",
206215
[(admin_v2.StorageType.HDD, False), (admin_v2.StorageType.SSD, True)],
@@ -215,15 +224,15 @@ def test_optimize_restored_table(
215224
second_instance_storage_type,
216225
expect_optimize_operation,
217226
):
218-
instance_with_backup, table_to_backup = create_instance(
227+
(instance_with_backup, table_to_backup) = create_instance(
219228
instance_admin_client,
220229
table_admin_client,
221230
data_client,
222231
admin_overlay_project_id,
223232
instances_to_delete,
224233
admin_v2.StorageType.HDD,
225234
)
226-
instance_to_restore, _ = create_instance(
235+
(instance_to_restore, _) = create_instance(
227236
instance_admin_client,
228237
table_admin_client,
229238
data_client,
@@ -273,7 +282,7 @@ def test_wait_for_consistency(
273282
instances_to_delete,
274283
admin_overlay_project_id,
275284
):
276-
instance, table = create_instance(
285+
(instance, table) = create_instance(
277286
instance_admin_client,
278287
table_admin_client,
279288
data_client,

0 commit comments

Comments
 (0)