From e17bc2ca4f7109f48629ffb23d82abc2f94341c0 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Sun, 8 Nov 2026 19:13:39 +0000 Subject: [PATCH] Exercise reset failure paths and scoped Docker resource cleanup --- scripts/test_uninstall.py | 66 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/scripts/test_uninstall.py b/scripts/test_uninstall.py index 71eb0f48..e293d47c 100644 --- a/scripts/test_uninstall.py +++ b/scripts/test_uninstall.py @@ -21,8 +21,11 @@ class Recorder: stdout = "" if command[:3] == ["docker", "ps", "-aq"]: stdout = "fixture-container\n" + if command[:4] == ["docker", "ps", "-a", "--format"]: + stdout = "ab12cd34 pipelines-flutter-android:3.44.6\naaabbb pipelines-flutter-web:3.44.6\ndeadbeef unrelated:latest\nbaadf00d pipelines-flutter-other:1\n" if command[:3] == ["docker", "volume", "ls"]: - stdout = "pipelines_pipelines-data\npipelines_ntfy-data\n" + stdout = ("pipelines-flutter-pub\npipelines-flutter-gradle\npipelines-android-sdk\npipelines_pipelines-data\npipelines_ntfy-data\nunrelated-volume\n" + if "--format" in command else "pipelines_labelled-data\n") if command[:3] == ["docker", "image", "ls"]: stdout = "pipelines-flutter-web:3.44.6\npipelines-flutter-android:3.44.6\nunrelated:latest\n" return subprocess.CompletedProcess(command, 0, stdout=stdout, stderr="") @@ -33,7 +36,7 @@ class UninstallTests(unittest.TestCase): self.temporary = tempfile.TemporaryDirectory(prefix="pipelines-reset-test-") self.addCleanup(self.temporary.cleanup) self.root = Path(self.temporary.name) - self.home = self.root / "home" + self.home = (self.root / "home").resolve() self.home.mkdir() self.repo = self.home / "repos/pipelines" self.repo.mkdir(parents=True) @@ -88,7 +91,7 @@ class UninstallTests(unittest.TestCase): self.assertFalse(target.exists(), str(target)) def test_recorded_custom_password_and_config_are_removed(self): - auth = self.put(self.home / "secrets/pipelines-login.json", "old password") + auth = self.put(self.home / "secrets/pipelines-login.json", json.dumps({"password": "old password", "secret": "old secret"})) old_config = self.home / "recorded-config" harness = self.put(old_config / "pipelines/harnesses.json", "old harness") self.put(self.prefix / "pipelines-install.json", json.dumps({ @@ -149,14 +152,69 @@ class UninstallTests(unittest.TestCase): self.assertTrue(any("net.a-wan.pipelines.service" in c and "disable" in c for c in commands)) self.assertFalse(any("other.service" in c for c in commands)) + def test_unavailable_docker_aborts_before_files_or_services_change(self): + marker = self.put(self.prefix / "keep", "keep") + original = self.recorder + + def stopped_docker(command, **kwargs): + if command[:2] == ["docker", "info"]: + original.calls.append(command) + return subprocess.CompletedProcess(command, 1, stdout="", stderr="not running") + return original(command, **kwargs) + + resetter = uninstall.Uninstall(home=self.home, repo=self.repo, + environ={}, runner=stopped_docker, system="Linux") + with self.assertRaisesRegex(RuntimeError, "Docker"): + resetter.run() + self.assertEqual(marker.read_text(), "keep") + self.assertFalse(any(c[0] == "systemctl" for c in original.calls)) + + def test_absent_docker_does_not_block_native_partial_cleanup(self): + self.put(self.prefix / "keep") + original = self.recorder + + def no_docker(command, **kwargs): + if command[0] == "docker": + raise FileNotFoundError("docker") + return original(command, **kwargs) + + uninstall.Uninstall(home=self.home, repo=self.repo, + environ={}, runner=no_docker, system="Linux").run() + self.assertFalse(self.prefix.exists()) + + def test_service_stop_failure_preserves_installation_and_password(self): + self.put(self.home / ".config/systemd/user/net.a-wan.pipelines.service", + "# Managed by Pipelines native installer\n") + auth = self.put(self.home / ".config/pipelines/web-auth.json", "keep password") + marker = self.put(self.prefix / "keep", "keep") + original = self.recorder + + def fail_stop(command, **kwargs): + if command[0] == "systemctl" and "disable" in command: + original.calls.append(command) + return subprocess.CompletedProcess(command, 1, stdout="", stderr="failed") + return original(command, **kwargs) + + with self.assertRaises(RuntimeError): + uninstall.Uninstall(home=self.home, repo=self.repo, + environ={}, runner=fail_stop, system="Linux").run() + self.assertEqual(auth.read_text(), "keep password") + self.assertEqual(marker.read_text(), "keep") + self.assertFalse(any("rm" in c for c in original.calls)) + def test_docker_cleanup_is_scoped_to_pipelines(self): self.resetter().run() docker = [c for c in self.recorder.calls if c and c[0] == "docker"] for command in docker: - if command[1:2] == ["ps"] or command[1:3] == ["volume", "ls"]: + if command[1:3] == ["ps", "-aq"] or (command[1:3] == ["volume", "ls"] and "-q" in command): self.assertIn("label=com.docker.compose.project=pipelines", command) self.assertNotIn("prune", command) self.assertFalse(any("unrelated:latest" in c and "rm" in c for c in docker)) + self.assertFalse(any("unrelated-volume" in c and "rm" in c for c in docker)) self.assertTrue(any("fixture-container" in c and "rm" in c for c in docker)) self.assertTrue(any("pipelines-flutter-pub" in c and "rm" in c for c in docker)) self.assertTrue(any("pipelines-flutter-web:3.44.6" in c and ("rm" in c or "rmi" in c) for c in docker)) + for owned in ("ab12cd34", "aaabbb", "pipelines_pipelines-data", "pipelines_ntfy-data"): + self.assertTrue(any(owned in c and "rm" in c for c in docker), owned) + for unrelated in ("deadbeef", "baadf00d"): + self.assertFalse(any(unrelated in c and "rm" in c for c in docker), unrelated)