# HG changeset patch # User Matt Harbison <matt_harbison@yahoo.com> # Date 1512265103 18000 # Sat Dec 02 20:38:23 2017 -0500 # Node ID b33d4cf38666a489210a666791bb683e8ccb5c8b # Parent feecfefeba258b288a26e181733f63a7c44ed644 tests: add a substitution for ENOTDIR/ERROR_PATH_NOT_FOUND messages diff --git a/tests/common-pattern.py b/tests/common-pattern.py --- a/tests/common-pattern.py +++ b/tests/common-pattern.py @@ -47,6 +47,13 @@ # FormatMessage(ERROR_FILE_NOT_FOUND) br'The system cannot find the file specified', ), + br'$ENOTDIR$': ( + # strerror() + br'Not a directory', + + # FormatMessage(ERROR_PATH_NOT_FOUND) + br'The system cannot find the path specified', + ), } for replace, msgs in _errors.items(): diff --git a/tests/test-origbackup-conflict.t b/tests/test-origbackup-conflict.t --- a/tests/test-origbackup-conflict.t +++ b/tests/test-origbackup-conflict.t @@ -129,8 +129,7 @@ b/c: replacing untracked file getting b/c creating directory: $TESTTMP/repo/.hg/badorigbackups/b (glob) - abort: The system cannot find the path specified: '$TESTTMP/repo/.hg/badorigbackups/b' (glob) (windows !) - abort: Not a directory: '$TESTTMP/repo/.hg/badorigbackups/b' (no-windows !) + abort: $ENOTDIR$: '$TESTTMP/repo/.hg/badorigbackups/b' (glob) [255] $ cat .hg/badorigbackups data