third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-19 17:14:43 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/commands/install_uninstall_test.py
View file

@ -948,7 +948,7 @@ def test_pre_merge_commit_integration(tempdir_factory, store):
output_pattern = re_assert.Matches( output_pattern = re_assert.Matches(
r'^\[INFO\] Initializing environment for .+\n' r'^\[INFO\] Initializing environment for .+\n'
r'Bash hook\.+Passed\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' foo \| 0\n'
r' 1 file changed, 0 insertions\(\+\), 0 deletions\(-\)\n' r' 1 file changed, 0 insertions\(\+\), 0 deletions\(-\)\n'
r' create mode 100644 foo\n$', r' create mode 100644 foo\n$',