From 98d42861577803ee83124ff385b9c963fcbb14e0 Mon Sep 17 00:00:00 2001 From: Wes Barnett Date: Thu, 15 Apr 2021 20:11:42 -0400 Subject: [PATCH] handle missing file --- scripts/snap_pac.py | 6 ++++-- tests/test_script.py | 23 ++++++++++++++--------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/scripts/snap_pac.py b/scripts/snap_pac.py index c054de8..080c513 100755 --- a/scripts/snap_pac.py +++ b/scripts/snap_pac.py @@ -38,7 +38,6 @@ class SnapperCmd: self.cmd.append("--no-dbus") self.cmd.extend([ f"--config {config} create", - f"--type {snapshot_type}", f"--cleanup-algorithm {cleanup_algorithm}", "--print-number" ]) @@ -50,7 +49,10 @@ class SnapperCmd: if pre_number is not None: self.cmd.append(f"--pre-number {pre_number}") else: - raise ValueError("snapshot type specified as 'post' but no pre snapshot number passed.") + logging.warning("snapshot type specified as 'post' but no pre snapshot number passed.") + logging.warning("setting snapshot type to 'single'.") + snapshot_type = "single" + self.cmd.append(f"--type {snapshot_type}") def __call__(self): return os.popen(self.__str__()).read().rstrip("\n") diff --git a/tests/test_script.py b/tests/test_script.py index f36dd8e..d5ef3a6 100644 --- a/tests/test_script.py +++ b/tests/test_script.py @@ -10,27 +10,32 @@ from scripts.snap_pac import check_skip, ConfigProcessor, get_snapper_configs, P @pytest.mark.parametrize("snapper_cmd, actual_cmd", [ ( SnapperCmd("root", "pre", "number", "foo"), - "snapper --config root create --type pre --cleanup-algorithm number --print-number --description \"foo\"" + "snapper --config root create --cleanup-algorithm number --print-number --description \"foo\" --type pre" ), ( SnapperCmd("root", "post", "number", "bar", False, 1234), - "snapper --config root create --type post --cleanup-algorithm number --print-number" - " --description \"bar\" --pre-number 1234" + "snapper --config root create --cleanup-algorithm number --print-number" + " --description \"bar\" --pre-number 1234 --type post" ), ( SnapperCmd("root", "post", "number", "bar", True, 1234), - "snapper --no-dbus --config root create --type post --cleanup-algorithm number --print-number" - " --description \"bar\" --pre-number 1234" + "snapper --no-dbus --config root create --cleanup-algorithm number --print-number" + " --description \"bar\" --pre-number 1234 --type post" ), ( SnapperCmd("root", "post", "number", "bar", False, 1234, "important=yes"), - "snapper --config root create --type post --cleanup-algorithm number --print-number" - " --description \"bar\" --userdata \"important=yes\" --pre-number 1234" + "snapper --config root create --cleanup-algorithm number --print-number" + " --description \"bar\" --userdata \"important=yes\" --pre-number 1234 --type post" ), ( SnapperCmd("root", "post", "number", "bar", False, 1234, "foo=bar,important=yes"), - "snapper --config root create --type post --cleanup-algorithm number --print-number" - " --description \"bar\" --userdata \"foo=bar,important=yes\" --pre-number 1234" + "snapper --config root create --cleanup-algorithm number --print-number" + " --description \"bar\" --userdata \"foo=bar,important=yes\" --pre-number 1234 --type post" + ), + ( + SnapperCmd("root", "post", "number", "bar", False, None, "foo=bar,important=yes"), + "snapper --config root create --cleanup-algorithm number --print-number" + " --description \"bar\" --userdata \"foo=bar,important=yes\" --type single" ) ]) def test_snapper_cmd(snapper_cmd, actual_cmd):