kevinveenbirkenbach/docker-volume-backup
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/docker-volume-backup.git synced 2025-12-27 11:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(e2e): stabilize MariaDB 11 tests and fix restore empty-mode client selection

Browse Source 
- add `make clean` and run it before `test-e2e` to avoid stale artifacts
- restore: do not hardcode `mysql` for --empty; use detected mariadb/mysql client
- e2e: improve subprocess error output for easier CI debugging
- e2e: adjust MariaDB readiness checks for socket-only root on MariaDB 11
- e2e: add `wait_for_mariadb_sql` and run SQL readiness checks for dedicated TCP user
- e2e: update MariaDB full/no-copy tests to use dedicated user over TCP and consistent credentials

https://chatgpt.com/share/694ecfb8-f8a8-800f-a1c9-a5f410d4ba02
This commit is contained in:
Kevin Veen-Birkenbach
2025-12-26 19:10:55 +01:00
parent 4af15d9074
commit cf6f4d8326
5 changed files with 257 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
tests/e2e/test_e2e_mariadb_full.py
View File

@@ -13,6 +13,7 @@ from .helpers import (
write_databases_csv,
run,
wait_for_mariadb,
wait_for_mariadb_sql,
)
@@ -31,30 +32,56 @@ class TestE2EMariaDBFull(unittest.TestCase):
cls.containers = [cls.db_container]
cls.volumes = [cls.db_volume]
cls.db_name = "appdb"
cls.db_user = "test"
cls.db_password = "testpw"
cls.root_password = "rootpw"
run(["docker", "volume", "create", cls.db_volume])
# Start MariaDB (no host port publishing needed; we will exec into the container)
run([
"docker", "run", "-d",
"--name", cls.db_container,
"-e", "MARIADB_ROOT_PASSWORD=rootpw",
"-v", f"{cls.db_volume}:/var/lib/mysql",
"mariadb:11",
])
wait_for_mariadb(cls.db_container, root_password="rootpw", timeout_s=90)
# Start MariaDB with a dedicated TCP-capable user for tests.
run(
[
"docker",
"run",
"-d",
"--name",
cls.db_container,
"-e",
f"MARIADB_ROOT_PASSWORD={cls.root_password}",
"-e",
f"MARIADB_DATABASE={cls.db_name}",
"-e",
f"MARIADB_USER={cls.db_user}",
"-e",
f"MARIADB_PASSWORD={cls.db_password}",
"-v",
f"{cls.db_volume}:/var/lib/mysql",
"mariadb:11",
]
)
# Create DB + data
run([
"docker", "exec", cls.db_container,
"sh", "-lc",
"mariadb -uroot -prootpw -e \"CREATE DATABASE appdb; "
"CREATE TABLE appdb.t (id INT PRIMARY KEY, v VARCHAR(50)); "
"INSERT INTO appdb.t VALUES (1,'ok');\"",
])
# Liveness + actual SQL login readiness (TCP)
wait_for_mariadb(cls.db_container, root_password=cls.root_password, timeout_s=90)
wait_for_mariadb_sql(cls.db_container, user=cls.db_user, password=cls.db_password, timeout_s=90)
# Create table + data via the dedicated user (TCP)
run(
[
"docker",
"exec",
cls.db_container,
"sh",
"-lc",
f"mariadb -h 127.0.0.1 -u{cls.db_user} -p{cls.db_password} "
f"-e \"CREATE TABLE {cls.db_name}.t (id INT PRIMARY KEY, v VARCHAR(50)); "
f"INSERT INTO {cls.db_name}.t VALUES (1,'ok');\"",
]
)
cls.databases_csv = f"/tmp/{cls.prefix}/databases.csv"
instance = cls.db_container
write_databases_csv(cls.databases_csv, [(instance, "appdb", "root", "rootpw")])
# IMPORTANT: baudolo backup expects credentials for the DB dump.
write_databases_csv(cls.databases_csv, [(cls.db_container, cls.db_name, cls.db_user, cls.db_password)])
# Backup with file+dump
backup_run(
@@ -68,38 +95,61 @@ class TestE2EMariaDBFull(unittest.TestCase):
cls.hash, cls.version = latest_version_dir(cls.backups_dir, cls.repo_name)
# Wipe DB
run([
"docker", "exec", cls.db_container,
"sh", "-lc",
"mariadb -uroot -prootpw -e \"DROP DATABASE appdb;\"",
])
# Wipe DB via the dedicated user (TCP)
run(
[
"docker",
"exec",
cls.db_container,
"sh",
"-lc",
f"mariadb -h 127.0.0.1 -u{cls.db_user} -p{cls.db_password} "
f"-e \"DROP TABLE {cls.db_name}.t;\"",
]
)
# Restore DB
run([
"baudolo-restore", "mariadb",
cls.db_volume, cls.hash, cls.version,
"--backups-dir", cls.backups_dir,
"--repo-name", cls.repo_name,
"--container", cls.db_container,
"--db-name", "appdb",
"--db-user", "root",
"--db-password", "rootpw",
"--empty",
])
# Restore DB (uses baudolo-restore which execs mysql/mariadb inside the container)
run(
[
"baudolo-restore",
"mariadb",
cls.db_volume,
cls.hash,
cls.version,
"--backups-dir",
cls.backups_dir,
"--repo-name",
cls.repo_name,
"--container",
cls.db_container,
"--db-name",
cls.db_name,
"--db-user",
cls.db_user,
"--db-password",
cls.db_password,
"--empty",
]
)
@classmethod
def tearDownClass(cls) -> None:
cleanup_docker(containers=cls.containers, volumes=cls.volumes)
def test_dump_file_exists(self) -> None:
p = backup_path(self.backups_dir, self.repo_name, self.version, self.db_volume) / "sql" / "appdb.backup.sql"
p = backup_path(self.backups_dir, self.repo_name, self.version, self.db_volume) / "sql" / f"{self.db_name}.backup.sql"
self.assertTrue(p.is_file(), f"Expected dump file at: {p}")
def test_data_restored(self) -> None:
p = run([
"docker", "exec", self.db_container,
"sh", "-lc",
"mariadb -uroot -prootpw -N -e \"SELECT v FROM appdb.t WHERE id=1;\"",
])
p = run(
[
"docker",
"exec",
self.db_container,
"sh",
"-lc",
f"mariadb -h 127.0.0.1 -u{self.db_user} -p{self.db_password} "
f"-N -e \"SELECT v FROM {self.db_name}.t WHERE id=1;\"",
]
)
self.assertEqual((p.stdout or "").strip(), "ok")