Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add a substitution for ENOTDIR/ERROR_PATH_NOT_FOUND messages
authorMatt Harbison <matt_harbison@yahoo.com>
Sat, 02 Dec 2017 20:38:23 -0500
changeset 35231 b33d4cf38666
parent 35230 feecfefeba25
child 35232 a037b6647d8c
tests: add a substitution for ENOTDIR/ERROR_PATH_NOT_FOUND messages
tests/common-pattern.py file | annotate | diff | comparison | revisions
tests/test-origbackup-conflict.t file | annotate | diff | comparison | revisions 
--- a/tests/common-pattern.py	Sat Dec 02 19:33:34 2017 -0500
+++ b/tests/common-pattern.py	Sat Dec 02 20:38:23 2017 -0500
@@ -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():
--- a/tests/test-origbackup-conflict.t	Sat Dec 02 19:33:34 2017 -0500
+++ b/tests/test-origbackup-conflict.t	Sat Dec 02 20:38:23 2017 -0500
@@ -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
mercurial