diff options
| author | Joris Roovers <joris.roovers@gmail.com> | 2023-02-15 10:35:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-15 10:35:39 +0000 |
| commit | 1e7bc91c6b01288c36cccc285d9ba6ab944a5b86 (patch) | |
| tree | 2e34a357f4f1f1f1e025b825d84b09aeee09fdb1 | |
| parent | 2c9af7877db095321c5a2af17b2bb65ecbbbdc9f (diff) | |
Integration tests: set git config commit.cleanup=verbatim (#447)
Modern git does commit message cleanup by default (e.g. removing trailing
whitespace). We disable this during integration testing by setting:
git config commit.cleanup=verbatim
| -rw-r--r-- | qa/base.py | 3 | ||||
| -rw-r--r-- | qa/expected/test_user_defined/test_user_defined_rules_examples_2 | 1 | ||||
| -rw-r--r-- | qa/test_user_defined.py | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -69,6 +69,9 @@ class BaseTestCase(TestCase): # http://stackoverflow.com/questions/5581857/git-and-the-umlaut-problem-on-mac-os-x git("config", "core.precomposeunicode", "true", _cwd=tmp_git_repo) + # Git now does commit message cleanup by default (e.g. removing trailing whitespace), disable that for testing + git("config", "commit.cleanup", "verbatim", _cwd=tmp_git_repo) + return tmp_git_repo @staticmethod diff --git a/qa/expected/test_user_defined/test_user_defined_rules_examples_2 b/qa/expected/test_user_defined/test_user_defined_rules_examples_2 index 9b96423..d706b12 100644 --- a/qa/expected/test_user_defined/test_user_defined_rules_examples_2 +++ b/qa/expected/test_user_defined/test_user_defined_rules_examples_2 @@ -2,3 +2,4 @@ 1: UC3 Branch name 'main' does not start with one of ['feature/', 'hotfix/', 'release/'] 1: UL1 Title contains the special character '$' 2: B4 Second line is not empty +3: B3 Line contains hard tab characters (\t) diff --git a/qa/test_user_defined.py b/qa/test_user_defined.py index 01419cd..718766c 100644 --- a/qa/test_user_defined.py +++ b/qa/test_user_defined.py @@ -18,7 +18,7 @@ class UserDefinedRuleTests(BaseTestCase): extra_path = self.get_example_path() commit_msg = "Release: Thi$ is å title\nContent on the second line\n$This line is ignored \nThis isn't\t\n" self.create_simple_commit(commit_msg) - output = gitlint("--extra-path", extra_path, _cwd=self.tmp_git_repo, _tty_in=True, _ok_code=[4]) + output = gitlint("--extra-path", extra_path, _cwd=self.tmp_git_repo, _tty_in=True, _ok_code=[5]) self.assertEqualStdout(output, self.get_expected("test_user_defined/test_user_defined_rules_examples_2")) def test_user_defined_rules_examples_with_config(self): |