opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-19 10:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Test against 1 or 2 databases

Browse Source
This commit is contained in:
John Davis
2022-09-16 00:39:03 -04:00
parent b30e4e14ae
commit 0a798ea536
3 changed files with 69 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/model/migrations/dbscript.py
+13 -7
View File
@@ -54,11 +54,21 @@ class DbScript:
self._set_dburl(config_file)
def upgrade(self, args: argparse.Namespace) -> None:
revision = self._parse_revision(args.revision)
command.upgrade(self.alembic_config, revision, args.sql)
def upgrade_to_revision(rev):
command.upgrade(self.alembic_config, rev, args.sql)
if args.revision:
revision = self._parse_revision(args.revision)
upgrade_to_revision(revision)
else: # Run for each model
self.alembic_config.set_main_option("sqlalchemy.url", self.gxy_url)
upgrade_to_revision("gxy@head")
self.alembic_config.set_main_option("sqlalchemy.url", self.tsi_url)
upgrade_to_revision("tsi@head")
def downgrade(self, args: argparse.Namespace) -> None:
command.downgrade(self.alembic_config, args.revision, args.sql)
revision = self._parse_revision(args.revision)
command.downgrade(self.alembic_config, revision, args.sql)
def revision(self, args: argparse.Namespace) -> None:
"""Create revision script for the gxy branch only."""
@@ -87,10 +97,6 @@ class DbScript:
gxy_config, tsi_config = self._get_configuration(config_file)
self.gxy_url = gxy_config.url
self.tsi_url = tsi_config.url
self._set_url(self.gxy_url)
def _set_url(self, url: str) -> None:
self.alembic_config.set_main_option("sqlalchemy.url", url)
def _parse_revision(self, rev):
# Relative revision identifier requires a branch label
scripts/db.py
+1 -1
View File
@@ -88,7 +88,7 @@ def main() -> None:
aliases=["u"],
parents=[config_arg_parser, sql_arg_parser],
)
upgrade_cmd_parser.add_argument("revision", help="Revision identifier", nargs="?", default="heads")
upgrade_cmd_parser.add_argument("revision", help="Revision identifier", nargs="?")
downgrade_cmd_parser = add_parser(
"downgrade",
test/unit/data/model/migrations/test_dbscript.py
+55 -18
View File
@@ -91,8 +91,8 @@ def tmp_directory():
yield tmp_dir
@pytest.fixture()
def config(url_factory, alembic_env_dir, alembic_config_text, tmp_directory, monkeypatch):
@pytest.fixture(params=["one database", "two databases"])
def config(url_factory, alembic_env_dir, alembic_config_text, tmp_directory, monkeypatch, request):
"""
Construct Config object for staging; setup staging env.
"""
@@ -100,17 +100,19 @@ def config(url_factory, alembic_env_dir, alembic_config_text, tmp_directory, mon
tsi_versions_dir = os.path.join(tmp_directory, "versions_tsi")
version_locations = f"{gxy_versions_dir};{tsi_versions_dir}"
dburl = url_factory()
gxy_dburl = url_factory()
tsi_dburl = gxy_dburl if request.param == "one database" else url_factory()
config_file_path = os.path.join(tmp_directory, "alembic.ini")
update_config_for_staging(alembic_config_text, alembic_env_dir, version_locations, dburl)
update_config_for_staging(alembic_config_text, alembic_env_dir, version_locations, gxy_dburl)
write_config_file(config_file_path, alembic_config_text)
alembic_cfg = Config(config_file_path)
create_alembic_branches(alembic_cfg, gxy_versions_dir, tsi_versions_dir)
monkeypatch.setenv("ALEMBIC_CONFIG", config_file_path)
monkeypatch.setenv("GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION", dburl)
monkeypatch.setenv("GALAXY_CONFIG_OVERRIDE_INSTALL_DATABASE_CONNECTION", dburl)
monkeypatch.setenv("GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION", gxy_dburl)
monkeypatch.setenv("GALAXY_INSTALL_CONFIG_OVERRIDE_INSTALL_DATABASE_CONNECTION", tsi_dburl)
return alembic_cfg
@@ -275,23 +277,21 @@ class TestUpgradeCommand:
assert completed.returncode == 0
assert "Running upgrade gxy0 -> 1" in completed.stderr
assert "Running upgrade 1 -> 2" in completed.stderr
assert "Running upgrade -> tsi0" in completed.stderr
heads = get_db_heads(config)
assert len(heads) == 2
assert "2" in heads
assert TSI_BASE_ID in heads
alembic.command.revision(config, rev_id="3", head="2")
# next upgrade: upgrades gxy to 3, no effect on tsi
# next upgrade: upgrades gxy to 3
completed = run_command(f"./db.sh upgrade")
assert completed.returncode == 0
assert "Running upgrade 2 -> 3" in completed.stderr
assert "tsi0" not in completed.stderr # no effect on tsi
heads = get_db_heads(config)
assert len(heads) == 2
assert "3" in heads
assert TSI_BASE_ID in heads
def test_upgrade_cmd_sql_only(self, config):
alembic.command.revision(config, rev_id="1", head=GXY_BASE_ID)
@@ -328,7 +328,7 @@ class TestUpgradeCommand:
alembic.command.revision(config, rev_id="d", head="c")
alembic.command.revision(config, rev_id="e", head="d")
# upgrades gxy to b: none + 2 (none > base > a)
# upgrades gxy to b: none + 2 (none -> base -> a)
completed = run_command(f"./db.sh upgrade +3")
assert completed.returncode == 0
assert "Running upgrade -> gxy0" in completed.stderr
@@ -338,7 +338,7 @@ class TestUpgradeCommand:
heads = get_db_heads(config)
assert heads == ("b",)
# upgrades gxy to d relative to b: b + 2 (b > c > d)
# upgrades gxy to d relative to b: b + 2 (b -> c -> d)
completed = run_command(f"./db.sh upgrade b+2")
assert completed.returncode == 0
assert "Running upgrade b -> c" in completed.stderr
@@ -355,7 +355,7 @@ class TestDowngradeCommand:
alembic.command.revision(config, rev_id="3", head="2")
alembic.command.upgrade(config, "heads")
completed = run_command(f"./db.sh downgrade 1") # downgrade gxy to 1, no effect on tsi
completed = run_command(f"./db.sh downgrade 1") # downgrade gxy to 1
assert completed.returncode == 0
assert "Running downgrade 3 -> 2" in completed.stderr
assert "Running downgrade 2 -> 1" in completed.stderr
@@ -364,8 +364,48 @@ class TestDowngradeCommand:
assert len(heads) == 2
assert "1" in heads
def test_downgrade_cmd_sql_only(self, config):
alembic.command.revision(config, rev_id="1", head=GXY_BASE_ID)
alembic.command.revision(config, rev_id="2", head="1")
alembic.command.revision(config, rev_id="3", head="2")
alembic.command.upgrade(config, "heads")
# TODO add same type of test cases as in TestUpgradeCommand
completed = run_command(f"./db.sh downgrade --sql 3:1") # downgrade gxy to 1, no effect on tsi
assert completed.returncode == 0
assert "UPDATE alembic_version SET version_num='2'" in completed.stdout
assert "UPDATE alembic_version SET version_num='1'" in completed.stdout
def test_downgrade_cmd_missing_revision_arg_error(self):
completed = run_command(f"./db.sh downgrade")
assert completed.returncode == 2
assert "the following arguments are required: revision" in completed.stderr
def test_downgrade_cmd_with_relative_revision_syntax(self, config):
alembic.command.revision(config, rev_id="a", head=GXY_BASE_ID)
alembic.command.revision(config, rev_id="b", head="a")
alembic.command.revision(config, rev_id="c", head="b")
alembic.command.revision(config, rev_id="d", head="c")
alembic.command.revision(config, rev_id="e", head="d")
alembic.command.upgrade(config, "heads")
# downgrades gxy to c: e - 2 (e -> d -> c)
completed = run_command(f"./db.sh downgrade -2")
assert completed.returncode == 0
assert "Running downgrade e -> d" in completed.stderr
assert "Running downgrade d -> c" in completed.stderr
heads = get_db_heads(config)
assert "c" in heads
# downgrades gxy to a relative to c: c - 2 (c -> b -> a)
completed = run_command(f"./db.sh downgrade c-2")
assert completed.returncode == 0
assert "Running downgrade c -> b" in completed.stderr
assert "Running downgrade b -> a" in completed.stderr
heads = get_db_heads(config)
assert "a" in heads
class TestDbVersionCommand:
@@ -382,6 +422,3 @@ class TestDbVersionCommand:
completed = run_command(f"./db.sh dbversion")
assert completed.returncode == 0
assert "2 (head)" in completed.stdout
# TODO test for 2 separate databases: gxy and tsi