Skip to content

test: fix failing backup system tests #2

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
larkee merged 2 commits into from
Jan 27, 2021
Merged

test: fix failing backup system tests #2

Changes from all commits
Commits
Show all changes
2 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
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
22 changes: 5 additions & 17 deletions tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,22 +600,6 @@ def setUpClass(cls):
op1.result(30) # raises on failure / timeout.
op2.result(30) # raises on failure / timeout.

# Add retention period for backups
retention_period = "7d"
ddl_statements = DDL_STATEMENTS + [
"ALTER DATABASE {}"
" SET OPTIONS (version_retention_period = '{}')".format(
cls.DATABASE_NAME, retention_period
)
]
db = Config.INSTANCE.database(
cls.DATABASE_NAME, pool=pool, ddl_statements=ddl_statements
)
operation = db.update_ddl(ddl_statements)
# We want to make sure the operation completes.
operation.result(240) # raises on failure / timeout.
db.reload()

current_config = Config.INSTANCE.configuration_name
same_config_instance_id = "same-config" + unique_resource_id("-")
create_time = str(int(time.time()))
Expand Down Expand Up @@ -727,7 +711,11 @@ def test_backup_workflow(self):
database = instance.database(restored_id)
self.to_drop.append(database)
operation = database.restore(source=backup)
operation.result()
restored_db = operation.result()
self.assertEqual(version_time, restored_db.restore_info.backup_info.create_time)

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

database.drop()
backup.delete()
Expand Down