Skip to content

test: Unskipped wait_for_consistency system tests in emulator #1186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gkevinzheng merged 5 commits into from
Aug 11, 2025
Merged

test: Unskipped wait_for_consistency system tests in emulator #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18cebba
test: Unskipped wait_for_consistency system tests in emulator
gkevinzheng Aug 11, 2025
895e65b
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Aug 11, 2025
0ed03bc
Added sync surface
gkevinzheng Aug 11, 2025
9211df6
Actual sync surface
gkevinzheng Aug 11, 2025
1554b31
Used pytest.mark.skipif
gkevinzheng Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions tests/system/admin_overlay/test_system_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,27 @@ async def create_instance(
default_storage_type=storage_type,
)

create_instance_request = admin_v2.CreateInstanceRequest(
parent=instance_admin_client.common_project_path(project_id),
instance_id=instance_id,
instance=admin_v2.Instance(
display_name=instance_id[
:30
], # truncate to 30 characters because of character limit
),
clusters=clusters,
)
operation = await instance_admin_client.create_instance(create_instance_request)
instance = await operation.result()
# Instance and cluster creation are currently unsupported in the Bigtable emulator
if os.getenv(BIGTABLE_EMULATOR):
# All we need for system tests so far is the instance name.
instance = admin_v2.Instance(
name=instance_admin_client.instance_path(project_id, instance_id),
)
else:
create_instance_request = admin_v2.CreateInstanceRequest(
parent=instance_admin_client.common_project_path(project_id),
instance_id=instance_id,
instance=admin_v2.Instance(
display_name=instance_id[
:30
], # truncate to 30 characters because of character limit
),
clusters=clusters,
)
operation = await instance_admin_client.create_instance(create_instance_request)
instance = await operation.result()

instances_to_delete.append(instance)
instances_to_delete.append(instance)

# Create a table within the instance
create_table_request = admin_v2.CreateTableRequest(
Expand Down Expand Up @@ -272,6 +279,10 @@ async def assert_table_cell_value_equal_to(
}
)
@CrossSync.pytest
@pytest.mark.skipif(
os.getenv(BIGTABLE_EMULATOR),
reason="Backups are not supported in the Bigtable emulator",
)
@pytest.mark.parametrize(
"second_instance_storage_type,expect_optimize_operation",
[
Expand Down
33 changes: 21 additions & 12 deletions tests/system/admin_overlay/test_system_autogen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,20 @@ def create_instance(
location=instance_admin_client.common_location_path(project_id, location),
default_storage_type=storage_type,
)
create_instance_request = admin_v2.CreateInstanceRequest(
parent=instance_admin_client.common_project_path(project_id),
instance_id=instance_id,
instance=admin_v2.Instance(display_name=instance_id[:30]),
clusters=clusters,
)
operation = instance_admin_client.create_instance(create_instance_request)
instance = operation.result()
instances_to_delete.append(instance)
if os.getenv(BIGTABLE_EMULATOR):
instance = admin_v2.Instance(
name=instance_admin_client.instance_path(project_id, instance_id)
)
else:
create_instance_request = admin_v2.CreateInstanceRequest(
parent=instance_admin_client.common_project_path(project_id),
instance_id=instance_id,
instance=admin_v2.Instance(display_name=instance_id[:30]),
clusters=clusters,
)
operation = instance_admin_client.create_instance(create_instance_request)
instance = operation.result()
instances_to_delete.append(instance)
create_table_request = admin_v2.CreateTableRequest(
parent=instance_admin_client.instance_path(project_id, instance_id),
table_id=TEST_TABLE_NAME,
Expand Down Expand Up @@ -201,6 +206,10 @@ def assert_table_cell_value_equal_to(
assert latest_cell.value.decode("utf-8") == value


@pytest.mark.skipif(
os.getenv(BIGTABLE_EMULATOR),
reason="Backups are not supported in the Bigtable emulator",
)
@pytest.mark.parametrize(
"second_instance_storage_type,expect_optimize_operation",
[(admin_v2.StorageType.HDD, False), (admin_v2.StorageType.SSD, True)],
Expand All @@ -215,15 +224,15 @@ def test_optimize_restored_table(
second_instance_storage_type,
expect_optimize_operation,
):
instance_with_backup, table_to_backup = create_instance(
(instance_with_backup, table_to_backup) = create_instance(
instance_admin_client,
table_admin_client,
data_client,
admin_overlay_project_id,
instances_to_delete,
admin_v2.StorageType.HDD,
)
instance_to_restore, _ = create_instance(
(instance_to_restore, _) = create_instance(
instance_admin_client,
table_admin_client,
data_client,
Expand Down Expand Up @@ -273,7 +282,7 @@ def test_wait_for_consistency(
instances_to_delete,
admin_overlay_project_id,
):
instance, table = create_instance(
(instance, table) = create_instance(
instance_admin_client,
table_admin_client,
data_client,
Expand Down
Loading