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

asottile · web-flow · commit a96bb23cafb8 · 2021-08-30T20:55:57.000-04:00
update tests for latest git
diff --git a/tests/commands/install_uninstall_test.py b/tests/commands/install_uninstall_test.py
@@ -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$',
