From d809e2417252f91cbaf496c5f748982ff5da5579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Caletka?= Date: Tue, 21 Dec 2021 22:24:00 +0100 Subject: [PATCH] Fixup tests for whitespace error handling --- test_dzonegit.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test_dzonegit.py b/test_dzonegit.py index 14dd63f..8886584 100644 --- a/test_dzonegit.py +++ b/test_dzonegit.py @@ -34,12 +34,15 @@ def test_check_whitespace_errors(git_dir): git_dir.chdir() git_dir.join("whitespace").write(" ") subprocess.call(["git", "add", "whitespace"]) + dzonegit.check_whitespace_errors(dzonegit.get_head()) + git_dir.join("whitespace.zone").write(" ") + subprocess.call(["git", "add", "whitespace.zone"]) with pytest.raises(ValueError): dzonegit.check_whitespace_errors(dzonegit.get_head()) subprocess.call(["git", "commit", "-m", "whitespace"]) with pytest.raises(ValueError): dzonegit.check_whitespace_errors("HEAD~", dzonegit.get_head()) - subprocess.call(["git", "rm", "-f", "whitespace"]) + subprocess.call(["git", "rm", "-f", "whitespace*"]) subprocess.call(["git", "commit", "-m", "rm whitespace"]) dzonegit.check_whitespace_errors(dzonegit.get_head()) dzonegit.check_whitespace_errors("HEAD~", dzonegit.get_head()) @@ -125,7 +128,7 @@ def test_get_altered_files(git_dir): assert files == {Path("dummy"), Path("new")} # Refers to test_check_whitespace_errors files = set(dzonegit.get_altered_files("HEAD~", "D", "HEAD")) - assert files == {Path("whitespace")} + assert files == {Path("whitespace"), Path("whitespace.zone")} subprocess.call(["git", "checkout", "-f", "HEAD"]) assert set(dzonegit.get_altered_files("HEAD", "AM")) == set()