Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test_import_export: Don't hard-code ZULIP_VERSION in fixtures. 

Otherwise, these tests fail if ZULIP_VERSION is different locally from
what's hard-coded. Use a placeholder instead and replace dynamically in
a helper function.
This commit is contained in:
Mateusz Mandera 2024-11-10 00:07:19 +01:00 committed by Tim Abbott
parent 9506950f09
commit 1f21b7437c
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/tests/fixtures/import_fixtures/check_migrations_errors/extra_migrations_error.txt vendored
View File

@ -1,6 +1,6 @@
Export was generated on a different Zulip version. Export was generated on a different Zulip version.
Export=10.0-dev+git Export={version_placeholder}
Server=10.0-dev+git Server={version_placeholder}
Database formats differ between the exported realm and this server. Database formats differ between the exported realm and this server.
Printing migrations that differ between the versions: Printing migrations that differ between the versions:

4
zerver/tests/fixtures/import_fixtures/check_migrations_errors/unapplied_migrations_error.txt vendored
View File

@ -1,6 +1,6 @@
Export was generated on a different Zulip version. Export was generated on a different Zulip version.
Export=10.0-dev+git Export={version_placeholder}
Server=10.0-dev+git Server={version_placeholder}
Database formats differ between the exported realm and this server. Database formats differ between the exported realm and this server.
Printing migrations that differ between the versions: Printing migrations that differ between the versions:

17
zerver/tests/test_import_export.py
View File

@ -348,6 +348,11 @@ class ExportFile(ZulipTestCase):
) )
return fixture return fixture
def get_applied_migrations_error_message(self, fixture_name: str) -> str:
fixture = self.fixture_data(fixture_name, "import_fixtures/check_migrations_errors")
fixture = fixture.format(version_placeholder=ZULIP_VERSION)
return fixture.strip()
def verify_migration_status_json(self) -> None: def verify_migration_status_json(self) -> None:
# This function asserts that the generated migration_status.json # This function asserts that the generated migration_status.json
# is structurally familiar for it to be used for assertion at # is structurally familiar for it to be used for assertion at
@ -2060,9 +2065,9 @@ class RealmImportExportTest(ExportFile):
) )
do_import_realm(get_output_dir(), "test-zulip") do_import_realm(get_output_dir(), "test-zulip")
expected_error_message = self.fixture_data( expected_error_message = self.get_applied_migrations_error_message(
"unapplied_migrations_error.txt", "import_fixtures/check_migrations_errors" "unapplied_migrations_error.txt"
).strip() )
error_message = str(e.exception).strip() error_message = str(e.exception).strip()
self.assertEqual(expected_error_message, error_message) self.assertEqual(expected_error_message, error_message)
@ -2085,9 +2090,9 @@ class RealmImportExportTest(ExportFile):
export_type=RealmExport.EXPORT_FULL_WITH_CONSENT, export_type=RealmExport.EXPORT_FULL_WITH_CONSENT,
) )
do_import_realm(get_output_dir(), "test-zulip") do_import_realm(get_output_dir(), "test-zulip")
expected_error_message = self.fixture_data( expected_error_message = self.get_applied_migrations_error_message(
"extra_migrations_error.txt", "import_fixtures/check_migrations_errors" "extra_migrations_error.txt"
).strip() )
error_message = str(e.exception).strip() error_message = str(e.exception).strip()
self.assertEqual(expected_error_message, error_message) self.assertEqual(expected_error_message, error_message)