Merge pull request #2031 from pre-commit/wtf-is-ort

update tests for latest git
This commit is contained in:
Anthony Sottile 2021-08-30 20:55:57 -04:00 committed by GitHub
commit a96bb23caf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -948,7 +948,7 @@ def test_pre_merge_commit_integration(tempdir_factory, store):
output_pattern = re_assert.Matches(
r'^\[INFO\] Initializing environment for .+\n'
r'Bash hook\.+Passed\n'
r"Merge made by the 'recursive' strategy.\n"
r"Merge made by the '(ort|recursive)' strategy.\n"
r' foo \| 0\n'
r' 1 file changed, 0 insertions\(\+\), 0 deletions\(-\)\n'
r' create mode 100644 foo\n$',