me/snap-pac
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle missing file

Browse source
This commit is contained in:
Wes Barnett 2021-04-15 20:11:42 -04:00
parent ea778aa380
commit 98d4286157
No known key found for this signature in database
GPG key ID: 1070BCC98C18BD66
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/snap_pac.py
View file

@ -38,7 +38,6 @@ class SnapperCmd:
self.cmd.append("--no-dbus") self.cmd.append("--no-dbus")
self.cmd.extend([ self.cmd.extend([
f"--config {config} create", f"--config {config} create",
f"--type {snapshot_type}",
f"--cleanup-algorithm {cleanup_algorithm}", f"--cleanup-algorithm {cleanup_algorithm}",
"--print-number" "--print-number"
]) ])
@ -50,7 +49,10 @@ class SnapperCmd:
if pre_number is not None: if pre_number is not None:
self.cmd.append(f"--pre-number {pre_number}") self.cmd.append(f"--pre-number {pre_number}")
else: 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): def __call__(self):
return os.popen(self.__str__()).read().rstrip("\n") return os.popen(self.__str__()).read().rstrip("\n")

23
tests/test_script.py
View file

@ -10,27 +10,32 @@ from scripts.snap_pac import check_skip, ConfigProcessor, get_snapper_configs, P
@pytest.mark.parametrize("snapper_cmd, actual_cmd", [ @pytest.mark.parametrize("snapper_cmd, actual_cmd", [
( (
SnapperCmd("root", "pre", "number", "foo"), 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), SnapperCmd("root", "post", "number", "bar", False, 1234),
"snapper --config root create --type post --cleanup-algorithm number --print-number" "snapper --config root create --cleanup-algorithm number --print-number"
" --description \"bar\" --pre-number 1234" " --description \"bar\" --pre-number 1234 --type post"
), ),
( (
SnapperCmd("root", "post", "number", "bar", True, 1234), SnapperCmd("root", "post", "number", "bar", True, 1234),
"snapper --no-dbus --config root create --type post --cleanup-algorithm number --print-number" "snapper --no-dbus --config root create --cleanup-algorithm number --print-number"
" --description \"bar\" --pre-number 1234" " --description \"bar\" --pre-number 1234 --type post"
), ),
( (
SnapperCmd("root", "post", "number", "bar", False, 1234, "important=yes"), SnapperCmd("root", "post", "number", "bar", False, 1234, "important=yes"),
"snapper --config root create --type post --cleanup-algorithm number --print-number" "snapper --config root create --cleanup-algorithm number --print-number"
" --description \"bar\" --userdata \"important=yes\" --pre-number 1234" " --description \"bar\" --userdata \"important=yes\" --pre-number 1234 --type post"
), ),
( (
SnapperCmd("root", "post", "number", "bar", False, 1234, "foo=bar,important=yes"), SnapperCmd("root", "post", "number", "bar", False, 1234, "foo=bar,important=yes"),
"snapper --config root create --type post --cleanup-algorithm number --print-number" "snapper --config root create --cleanup-algorithm number --print-number"
" --description \"bar\" --userdata \"foo=bar,important=yes\" --pre-number 1234" " --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): def test_snapper_cmd(snapper_cmd, actual_cmd):