cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ansible-test - change diff mathching regexp so prefixes are optional

Browse source 
The `a/` and `b/` prefixes can be disabled in the `git diff` output by setting
`diff.noprefix` to `true`. The output is still a valid diff, but `ansible-test` would
raise an exception since without the prefixes, it thought the diff line was invalid.
This commit is contained in:
Sam Doran 2021-04-07 12:37:28 -04:00 committed by Matt Clay
parent 7b79b69369
commit 4df9ea86c2
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelogs/fragments/ansible-test-diff-prefix-optional.yml Normal file
View file

@ -0,0 +1,4 @@
bugfixes:
- >-
ansible-test - make the ``a/`` and ``b/`` prefixes an optional match
since these can be turned off with the ``diff.noprefix`` setting in ``git``

2
test/lib/ansible_test/_internal/diff.py
View file

@ -180,7 +180,7 @@ class DiffParser:
"""Process a diff start line.""" """Process a diff start line."""
self.complete_file() self.complete_file()
match = re.search(r'^diff --git "?a/(?P<old_path>.*)"? "?b/(?P<new_path>.*)"?$', self.line) match = re.search(r'^diff --git "?(?:a/)?(?P<old_path>.*)"? "?(?:b/)?(?P<new_path>.*)"?$', self.line)
if not match: if not match:
raise Exception('Unexpected diff start line.') raise Exception('Unexpected diff start line.')