Skip to content
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

Jump to bottom

Suppress instance creation tests by default on CI #3951

Merged
merged 4 commits into from
Sep 13, 2017
Merged

Suppress instance creation tests by default on CI #3951

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbb8a0a
Suppress instance creation tests by default on CI.
tseaver Sep 13, 2017
4cb1d1d
Fix 'populate_streaming' script after PR #3787.
tseaver Sep 13, 2017
c60f926
Add utility for scrubbing orphaned instances.
tseaver Sep 13, 2017
8582a76
License header, formatting.
tseaver Sep 13, 2017
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
3 changes: 1 addition & 2 deletions spanner/tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
from tests._fixtures import DDL_STATEMENTS


IS_CIRCLE = os.getenv('CIRCLECI') == 'true'
CREATE_INSTANCE = IS_CIRCLE or os.getenv(
CREATE_INSTANCE = os.getenv(
'GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE') is not None

if CREATE_INSTANCE:
Expand Down
10 changes: 6 additions & 4 deletions spanner/tests/system/utils/populate_streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ def ensure_database(client):
def populate_table(database, table_desc):
all_ = KeySet(all_=True)
columns = ('pkey', 'chunk_me')
rows = list(database.execute_sql(
'SELECT COUNT(*) FROM {}'.format(table_desc.table)))
with database.snapshot() as snapshot:
rows = list(snapshot.execute_sql(
'SELECT COUNT(*) FROM {}'.format(table_desc.table)))
assert len(rows) == 1
count = rows[0][0]
if count != table_desc.row_count:
Expand All @@ -102,8 +103,9 @@ def populate_table(database, table_desc):
def populate_table_2_columns(database, table_desc):
all_ = KeySet(all_=True)
columns = ('pkey', 'chunk_me', 'chunk_me_2')
rows = list(database.execute_sql(
'SELECT COUNT(*) FROM {}'.format(table_desc.table)))
with database.snapshot() as snapshot:
rows = list(snapshot.execute_sql(
'SELECT COUNT(*) FROM {}'.format(table_desc.table)))
assert len(rows) == 1
count = rows[0][0]
if count != table_desc.row_count:
Expand Down
24 changes: 24 additions & 0 deletions spanner/tests/system/utils/scrub_instances.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
from google.cloud.spanner import Client

This comment was marked as spam.

Sign in to view

from .streaming_utils import INSTANCE_NAME as STREAMING_INSTANCE

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


STANDARD_INSTANCE = 'google-cloud-python-systest'


def scrub_instances(client):

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

for instance in client.list_instances():
if instance.name == STREAMING_INSTANCE:
print('Not deleting streaming instance: {}'.format(
STREAMING_INSTANCE))
continue
elif instance.name == STANDARD_INSTANCE:
print('Not deleting standard instance: {}'.format(
STANDARD_INSTANCE))
else:
print("deleting instance: {}".format(instance.name))
instance.delete()


if __name__ == '__main__':
client = Client()
scrub_instances(client)