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

test: refactor database version time to prevent flakiness #3

Merged
merged 4 commits into from Jan 27, 2021
Merged

test: refactor database version time to prevent flakiness #3

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
466ef3c
Remove unnecessary retention period setting
zoercai Jan 22, 2021
413dbc9
Fix systests
zoercai Jan 25, 2021
ffd0b91
Merge branch 'pitr-support' of github.com:larkee/python-spanner into …
zoercai Jan 27, 2021
aa7a27a
Review changes
zoercai Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 8 additions & 9 deletions tests/system/test_system.py
View file
Open in desktop
Expand Up @@ -585,6 +585,8 @@ class TestBackupAPI(unittest.TestCase, _TestData):

@classmethod
def setUpClass(cls):
from datetime import datetime

pool = BurstyPool(labels={"testcase": "database_api"})
ddl_statements = EMULATOR_DDL_STATEMENTS if USE_EMULATOR else DDL_STATEMENTS
db1 = Config.INSTANCE.database(
Expand All @@ -597,6 +599,7 @@ def setUpClass(cls):
op2 = db2.create()
op1.result(30) # raises on failure / timeout.
op2.result(30) # raises on failure / timeout.
cls.database_version_time = datetime.utcnow().replace(tzinfo=UTC)

current_config = Config.INSTANCE.configuration_name
same_config_instance_id = "same-config" + unique_resource_id("-")
Expand Down Expand Up @@ -670,15 +673,13 @@ def test_backup_workflow(self):
backup_id = "backup_id" + unique_resource_id("_")
expire_time = datetime.utcnow() + timedelta(days=3)
expire_time = expire_time.replace(tzinfo=UTC)
version_time = datetime.utcnow() - timedelta(seconds=5)
version_time = version_time.replace(tzinfo=UTC)

# Create backup.
backup = instance.backup(
backup_id,
database=self._db,
expire_time=expire_time,
version_time=version_time,
version_time=self.database_version_time,
)
operation = backup.create()
self.to_delete.append(backup)
Expand All @@ -694,7 +695,7 @@ def test_backup_workflow(self):
self.assertEqual(self._db.name, backup._database)
self.assertEqual(expire_time, backup.expire_time)
self.assertIsNotNone(backup.create_time)
self.assertEqual(version_time, backup.version_time)
self.assertEqual(self.database_version_time, backup.version_time)
self.assertIsNotNone(backup.size_bytes)
self.assertIsNotNone(backup.state)

Expand All @@ -710,10 +711,10 @@ def test_backup_workflow(self):
self.to_drop.append(database)
operation = database.restore(source=backup)
restored_db = operation.result()
self.assertEqual(version_time, restored_db.restore_info.backup_info.create_time)
self.assertEqual(self.database_version_time, restored_db.restore_info.backup_info.create_time)

metadata = operation.metadata
self.assertEqual(version_time, metadata.backup_info.create_time)
self.assertEqual(self.database_version_time, metadata.backup_info.create_time)

database.drop()
backup.delete()
Expand Down Expand Up @@ -889,14 +890,12 @@ def test_list_backups(self):
instance = Config.INSTANCE
expire_time_1 = datetime.utcnow() + timedelta(days=21)
expire_time_1 = expire_time_1.replace(tzinfo=UTC)
version_time_1 = datetime.utcnow() - timedelta(minutes=5)
version_time_1 = version_time_1.replace(tzinfo=UTC)

backup1 = Config.INSTANCE.backup(
backup_id_1,
database=self._dbs[0],
expire_time=expire_time_1,
version_time=version_time_1,
version_time=self.database_version_time,
)

expire_time_2 = datetime.utcnow() + timedelta(days=1)
Expand Down