update tests, linting

This commit is contained in:
Wes Barnett 2021-02-15 20:34:58 -05:00
parent baf8fce9c6
commit 7e99ee19c3
No known key found for this signature in database
GPG key ID: 1070BCC98C18BD66
2 changed files with 26 additions and 27 deletions

View file

@ -17,6 +17,8 @@ jobs:
with: with:
python-version: 3.9 python-version: 3.9
- name: Install dependencies - name: Install dependencies
run: python -m pip install --upgrade pip pytest run: python -m pip install --upgrade pip pytest flake8
- name: Run tests with pytest - name: Run linter
run: pytest -v tests.py run: flake8 --max-line-length=120 scripts/
- name: Run tests
run: pytest -v

View file

@ -39,24 +39,24 @@ def prefile():
return name return name
def test_snapper_cmd_pre(): @pytest.mark.parametrize("snapper_cmd, actual_cmd", [
snapper_cmd = SnapperCmd("root", "pre", "number", "foo") (
cmd = "snapper --config root create --type pre --cleanup-algorithm number --print-number --description \"foo\"" SnapperCmd("root", "pre", "number", "foo"),
assert str(snapper_cmd) == cmd "snapper --config root create --type pre --cleanup-algorithm number --print-number --description \"foo\""
),
(
def test_snapper_cmd_post(): SnapperCmd("root", "post", "number", "bar", False, 1234),
snapper_cmd = SnapperCmd("root", "post", "number", "bar", False, 1234) "snapper --config root create --type post --cleanup-algorithm number --print-number"
cmd = "snapper --config root create --type post --cleanup-algorithm number --print-number" " --description \"bar\" --pre-number 1234"
cmd += " --description \"bar\" --pre-number 1234" ),
assert str(snapper_cmd) == cmd (
SnapperCmd("root", "post", "number", "bar", True, 1234),
"snapper --no-dbus --config root create --type post --cleanup-algorithm number --print-number"
def test_snapper_cmd_post_nodbus(): " --description \"bar\" --pre-number 1234"
snapper_cmd = SnapperCmd("root", "post", "number", "bar", True, 1234) )
cmd = "snapper --no-dbus --config root create --type post --cleanup-algorithm number --print-number" ])
cmd += " --description \"bar\" --pre-number 1234" def test_snapper_cmd(snapper_cmd, actual_cmd):
assert str(snapper_cmd) == cmd assert str(snapper_cmd) == actual_cmd
def test_get_snapper_configs(): def test_get_snapper_configs():
@ -100,9 +100,6 @@ def test_write_pre_number(prefile):
assert get_pre_number("post", prefile) == "5678" assert get_pre_number("post", prefile) == "5678"
def test_get_pre_description(config): @pytest.mark.parametrize("snapshot_type, description", [("pre", "foo"), ("post", "a r")])
assert get_description("pre", config, "home") == "foo" def test_get_description(snapshot_type, description, config):
assert get_description(snapshot_type, config, "home") == description
def test_get_post_description(config):
assert get_description("post", config, "home") == "a r"