Skip to content

Avoid sharing database name between testcase classes.#4285

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
tseaver merged 2 commits into from
Nov 6, 2017
Merged

Avoid sharing database name between testcase classes. #4285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af9bb7e
Avoid sharing database name between testcase classes.
tseaver Oct 30, 2017
1fcdcc4
Mangle database name w/ 'unique_resource_id'.
tseaver Oct 31, 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
7 changes: 4 additions & 3 deletions spanner/tests/system/test_system.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,6 @@
else:
INSTANCE_ID = os.environ.get('GOOGLE_CLOUD_TESTS_SPANNER_INSTANCE',
'google-cloud-python-systest')
DATABASE_ID = 'test_database'
EXISTING_INSTANCES = []
COUNTERS_TABLE = 'counters'
COUNTERS_COLUMNS = ('name', 'value')
Expand DownExpand Up@@ -237,12 +236,13 @@ def _check_row_data(self, row_data, expected=None):


class TestDatabaseAPI(unittest.TestCase, _TestData):
DATABASE_NAME = 'test_database' + unique_resource_id('_')

@classmethod
def setUpClass(cls):
pool = BurstyPool()
cls._db = Config.INSTANCE.database(
DATABASE_ID, ddl_statements=DDL_STATEMENTS, pool=pool)
cls.DATABASE_NAME, ddl_statements=DDL_STATEMENTS, pool=pool)
cls._db.create()

@classmethod
Expand DownExpand Up@@ -376,6 +376,7 @@ def _unit_of_work(transaction, name):


class TestSessionAPI(unittest.TestCase, _TestData):
DATABASE_NAME = 'test_sessions' + unique_resource_id('_')
ALL_TYPES_TABLE = 'all_types'
ALL_TYPES_COLUMNS = (
'list_goes_on',
Expand DownExpand Up@@ -407,7 +408,7 @@ class TestSessionAPI(unittest.TestCase, _TestData):
def setUpClass(cls):
pool = BurstyPool()
cls._db = Config.INSTANCE.database(
DATABASE_ID, ddl_statements=DDL_STATEMENTS, pool=pool)
cls.DATABASE_NAME, ddl_statements=DDL_STATEMENTS, pool=pool)
operation = cls._db.create()
operation.result(30) # raises on failure / timeout.

Expand Down