##// END OF EJS Templates
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages...
Matt Harbison -
r35230:feecfefe default
parent child Browse files
Show More
@@ -37,3 +37,17 b' substitutions = ['
37 br' - - [$LOGDATE$] "GET'
37 br' - - [$LOGDATE$] "GET'
38 ),
38 ),
39 ]
39 ]
40
41 # Various platform error strings, keyed on a common replacement string
42 _errors = {
43 br'$ENOENT$': (
44 # strerror()
45 br'No such file or directory',
46
47 # FormatMessage(ERROR_FILE_NOT_FOUND)
48 br'The system cannot find the file specified',
49 ),
50 }
51
52 for replace, msgs in _errors.items():
53 substitutions.extend((m, replace) for m in msgs)
@@ -925,7 +925,7 b' file specified by acl.config does not ex'
925 bundle2-input-bundle: 4 parts total
925 bundle2-input-bundle: 4 parts total
926 transaction abort!
926 transaction abort!
927 rollback completed
927 rollback completed
928 abort: No such file or directory: ../acl.config
928 abort: $ENOENT$: ../acl.config
929 no rollback information available
929 no rollback information available
930 0:6675d58eff77
930 0:6675d58eff77
931
931
@@ -31,8 +31,7 b''
31 $ hg forget foo
31 $ hg forget foo
32
32
33 $ hg -v addremove nonexistent
33 $ hg -v addremove nonexistent
34 nonexistent: The system cannot find the file specified (windows !)
34 nonexistent: $ENOENT$
35 nonexistent: No such file or directory (no-windows !)
36 [1]
35 [1]
37
36
38 $ cd ..
37 $ cd ..
@@ -86,8 +85,7 b''
86 $ rm c
85 $ rm c
87
86
88 $ hg ci -A -m "c" nonexistent
87 $ hg ci -A -m "c" nonexistent
89 nonexistent: The system cannot find the file specified (windows !)
88 nonexistent: $ENOENT$
90 nonexistent: No such file or directory (no-windows !)
91 abort: failed to mark all new/missing files as added/removed
89 abort: failed to mark all new/missing files as added/removed
92 [255]
90 [255]
93
91
@@ -556,8 +556,8 b' annotate missing file'
556 $ rm baz
556 $ rm baz
557
557
558 $ hg annotate -ncr "wdir()" baz
558 $ hg annotate -ncr "wdir()" baz
559 abort: $TESTTMP\repo\baz: The system cannot find the file specified (windows !)
559 abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
560 abort: No such file or directory: $TESTTMP/repo/baz (no-windows !)
560 abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
561 [255]
561 [255]
562
562
563 annotate removed file
563 annotate removed file
@@ -565,8 +565,8 b' annotate removed file'
565 $ hg rm baz
565 $ hg rm baz
566
566
567 $ hg annotate -ncr "wdir()" baz
567 $ hg annotate -ncr "wdir()" baz
568 abort: $TESTTMP\repo\baz: The system cannot find the file specified (windows !)
568 abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
569 abort: No such file or directory: $TESTTMP/repo/baz (no-windows !)
569 abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
570 [255]
570 [255]
571
571
572 $ hg revert --all --no-backup --quiet
572 $ hg revert --all --no-backup --quiet
@@ -94,8 +94,7 b" However, we can't prevent it from loadin"
94 [255]
94 [255]
95
95
96 $ hg log -b --cwd=inexistent default
96 $ hg log -b --cwd=inexistent default
97 abort: No such file or directory: 'inexistent' (no-windows !)
97 abort: $ENOENT$: 'inexistent'
98 abort: The system cannot find the file specified: 'inexistent' (windows !)
99 [255]
98 [255]
100
99
101 $ hg log -b '--config=ui.traceback=yes' 2>&1 | grep '^Traceback'
100 $ hg log -b '--config=ui.traceback=yes' 2>&1 | grep '^Traceback'
@@ -212,7 +211,7 b' Current directory removed:'
212 The output could be one of the following and something else:
211 The output could be one of the following and something else:
213 chg: abort: failed to getcwd (errno = *) (glob)
212 chg: abort: failed to getcwd (errno = *) (glob)
214 abort: error getting current working directory: * (glob)
213 abort: error getting current working directory: * (glob)
215 sh: 0: getcwd() failed: No such file or directory
214 sh: 0: getcwd() failed: $ENOENT$
216 Since the exact behavior depends on the shell, only check it returns non-zero.
215 Since the exact behavior depends on the shell, only check it returns non-zero.
217 $ HGDEMANDIMPORT=disable hg version -q 2>/dev/null || false
216 $ HGDEMANDIMPORT=disable hg version -q 2>/dev/null || false
218 [1]
217 [1]
@@ -88,8 +88,7 b" we don't fix up relative file URLs, but "
88 $ mkdir sub
88 $ mkdir sub
89 $ cd sub
89 $ cd sub
90 $ hg log -qr "extdata(filedata)"
90 $ hg log -qr "extdata(filedata)"
91 abort: error: The system cannot find the file specified (windows !)
91 abort: error: $ENOENT$
92 abort: error: No such file or directory (no-windows !)
93 [255]
92 [255]
94 $ hg log -qr "extdata(shelldata)"
93 $ hg log -qr "extdata(shelldata)"
95 2:f6ed99a58333
94 2:f6ed99a58333
@@ -265,7 +265,7 b" Check recursive uses of 'include:'"
265 $ cp otherignore goodignore
265 $ cp otherignore goodignore
266 $ echo "include:badignore" >> otherignore
266 $ echo "include:badignore" >> otherignore
267 $ hg status
267 $ hg status
268 skipping unreadable pattern file 'badignore': No such file or directory
268 skipping unreadable pattern file 'badignore': $ENOENT$
269 A dir/b.o
269 A dir/b.o
270
270
271 $ mv goodignore otherignore
271 $ mv goodignore otherignore
@@ -354,7 +354,8 b' Corrupt histedit state file'
354 $ mv ../corrupt-histedit .hg/histedit-state
354 $ mv ../corrupt-histedit .hg/histedit-state
355 $ hg histedit --abort
355 $ hg histedit --abort
356 warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up
356 warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up
357 abort: .*(No such file or directory:|The system cannot find the file specified).* (re)
357 abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows !)
358 abort: $ENOENT$: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg (glob) (no-windows !)
358 [255]
359 [255]
359 Histedit state has been exited
360 Histedit state has been exited
360 $ hg summary -q
361 $ hg summary -q
@@ -685,7 +685,7 b' test python hook configured with python:'
685
685
686 $ hg up null
686 $ hg up null
687 loading update.ne hook failed:
687 loading update.ne hook failed:
688 abort: No such file or directory: $TESTTMP/d/repo/nonexistent.py
688 abort: $ENOENT$: $TESTTMP/d/repo/nonexistent.py
689 [255]
689 [255]
690
690
691 $ hg id
691 $ hg id
@@ -216,8 +216,7 b' Test that "hg rollback" restores status '
216 $ hg add --large largeY
216 $ hg add --large largeY
217
217
218 $ hg status -A large1
218 $ hg status -A large1
219 large1: The system cannot find the file specified (windows !)
219 large1: $ENOENT$
220 large1: No such file or directory (no-windows !)
221
220
222 $ hg status -A large2
221 $ hg status -A large2
223 ? large2
222 ? large2
@@ -309,8 +308,7 b' automated commit like rebase/transplant'
309 rebasing 4:07d6153b5c04 "#4" (tip)
308 rebasing 4:07d6153b5c04 "#4" (tip)
310
309
311 $ hg status -A large1
310 $ hg status -A large1
312 large1: The system cannot find the file specified (windows !)
311 large1: $ENOENT$
313 large1: No such file or directory (no-windows !)
314
312
315 $ hg status -A largeX
313 $ hg status -A largeX
316 C largeX
314 C largeX
@@ -320,8 +318,7 b' automated commit like rebase/transplant'
320 $ hg transplant -q 1 4
318 $ hg transplant -q 1 4
321
319
322 $ hg status -A large1
320 $ hg status -A large1
323 large1: The system cannot find the file specified (windows !)
321 large1: $ENOENT$
324 large1: No such file or directory (no-windows !)
325
322
326 $ hg status -A largeX
323 $ hg status -A largeX
327 C largeX
324 C largeX
@@ -331,8 +328,7 b' automated commit like rebase/transplant'
331 $ hg transplant -q --merge 1 --merge 4
328 $ hg transplant -q --merge 1 --merge 4
332
329
333 $ hg status -A large1
330 $ hg status -A large1
334 large1: The system cannot find the file specified (windows !)
331 large1: $ENOENT$
335 large1: No such file or directory (no-windows !)
336
332
337 $ hg status -A largeX
333 $ hg status -A largeX
338 C largeX
334 C largeX
@@ -1271,7 +1271,7 b' Wreak havoc on the unshelve process'
1271 $ rm .hg/unshelverebasestate
1271 $ rm .hg/unshelverebasestate
1272 $ hg unshelve --abort
1272 $ hg unshelve --abort
1273 unshelve of 'default' aborted
1273 unshelve of 'default' aborted
1274 abort: (No such file or directory|The system cannot find the file specified) (re)
1274 abort: $ENOENT$
1275 [255]
1275 [255]
1276 Can the user leave the current state?
1276 Can the user leave the current state?
1277 $ hg up -C .
1277 $ hg up -C .
@@ -83,8 +83,7 b' Status compared to parent of the working'
83 ! missing_missing_missing-tracked
83 ! missing_missing_missing-tracked
84
84
85 $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
85 $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
86 missing_missing_missing-untracked: The system cannot find the file specified (windows !)
86 missing_missing_missing-untracked: $ENOENT$
87 missing_missing_missing-untracked: No such file or directory (no-windows !)
88
87
89 Status between first and second commit. Should ignore dirstate status.
88 Status between first and second commit. Should ignore dirstate status.
90
89
@@ -640,9 +640,10 b' Test forgetting files, not implemented i'
640 traceback
640 traceback
641 #if no-windows
641 #if no-windows
642 $ hg forget 'notafile*'
642 $ hg forget 'notafile*'
643 notafile*: No such file or directory
643 notafile*: $ENOENT$
644 [1]
644 [1]
645 #else
645 #else
646 error: The filename, directory name, or volume label syntax is incorrect
646 $ hg forget 'notafile'
647 $ hg forget 'notafile'
647 notafile: * (glob)
648 notafile: * (glob)
648 [1]
649 [1]
@@ -571,15 +571,9 b' Test archive'
571 Test forgetting files, not implemented in svn subrepo, used to
571 Test forgetting files, not implemented in svn subrepo, used to
572 traceback
572 traceback
573
573
574 #if no-windows
575 $ hg forget 'notafile*'
574 $ hg forget 'notafile*'
576 notafile*: No such file or directory
575 notafile*: $ENOENT$
577 [1]
576 [1]
578 #else
579 $ hg forget 'notafile'
580 notafile: * (glob)
581 [1]
582 #endif
583
577
584 Test a subrepo referencing a just moved svn path. Last commit rev will
578 Test a subrepo referencing a just moved svn path. Last commit rev will
585 be different from the revision, and the path will be different as
579 be different from the revision, and the path will be different as
@@ -378,7 +378,7 b' Test patterns:'
378 f glob:glob glob:glob
378 f glob:glob glob:glob
379 $ hg debugwalk glob:glob
379 $ hg debugwalk glob:glob
380 matcher: <patternmatcher patterns='(?:glob$)'>
380 matcher: <patternmatcher patterns='(?:glob$)'>
381 glob: No such file or directory
381 glob: $ENOENT$
382 $ hg debugwalk glob:glob:glob
382 $ hg debugwalk glob:glob:glob
383 matcher: <patternmatcher patterns='(?:glob\\:glob$)'>
383 matcher: <patternmatcher patterns='(?:glob\\:glob$)'>
384 f glob:glob glob:glob exact
384 f glob:glob glob:glob exact
General Comments 0
You need to be logged in to leave comments. Login now