##// END OF EJS Templates
tests: Adapt expected output for minor differences with rhg...
Simon Sapin -
r47471:e96a0a53 default
parent child Browse files
Show More
@@ -264,7 +264,7 b' Testing --debug:'
264
264
265 Testing --traceback:
265 Testing --traceback:
266
266
267 #if no-chg
267 #if no-chg no-rhg
268 $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
268 $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
269 Traceback (most recent call last):
269 Traceback (most recent call last):
270 Traceback (most recent call last): (py3 !)
270 Traceback (most recent call last): (py3 !)
@@ -59,7 +59,7 b' Check %include'
59 #if unix-permissions no-root
59 #if unix-permissions no-root
60 $ chmod u-r $TESTTMP/included
60 $ chmod u-r $TESTTMP/included
61 $ hg showconfig section
61 $ hg showconfig section
62 config error at $TESTTMP/hgrc:2: cannot include $TESTTMP/included (Permission denied)
62 config error at $TESTTMP/hgrc:2: cannot include $TESTTMP/included (Permission denied*) (glob)
63 [255]
63 [255]
64 #endif
64 #endif
65
65
@@ -390,6 +390,7 b' Test (non-)escaping of remote paths with'
390 abort: destination 'a repo' is not empty
390 abort: destination 'a repo' is not empty
391 [10]
391 [10]
392
392
393 #if no-rhg
393 Make sure hg is really paranoid in serve --stdio mode. It used to be
394 Make sure hg is really paranoid in serve --stdio mode. It used to be
394 possible to get a debugger REPL by specifying a repo named --debugger.
395 possible to get a debugger REPL by specifying a repo named --debugger.
395 $ hg -R --debugger serve --stdio
396 $ hg -R --debugger serve --stdio
@@ -402,6 +403,27 b" Abbreviations of 'serve' also don't work"
402 $ hg -R narf serv --stdio
403 $ hg -R narf serv --stdio
403 abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio']
404 abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio']
404 [255]
405 [255]
406 #else
407 rhg aborts early on -R without a repository at that path
408 $ hg -R --debugger serve --stdio
409 abort: potentially unsafe serve --stdio invocation: ['-R', '--debugger', 'serve', '--stdio'] (missing-correct-output !)
410 abort: repository --debugger not found (known-bad-output !)
411 [255]
412 $ hg -R --config=ui.debugger=yes serve --stdio
413 abort: potentially unsafe serve --stdio invocation: ['-R', '--config=ui.debugger=yes', 'serve', '--stdio'] (missing-correct-output !)
414 abort: repository --config=ui.debugger=yes not found (known-bad-output !)
415 [255]
416 $ hg -R narf serv --stdio
417 abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio'] (missing-correct-output !)
418 abort: repository narf not found (known-bad-output !)
419 [255]
420 If the repo does exist, rhg finds an unsupported command and falls back to Python
421 which still does the right thing
422 $ hg init narf
423 $ hg -R narf serv --stdio
424 abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio']
425 [255]
426 #endif
405
427
406 Test hg-ssh using a helper script that will restore PYTHONPATH (which might
428 Test hg-ssh using a helper script that will restore PYTHONPATH (which might
407 have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right
429 have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right
General Comments 0
You need to be logged in to leave comments. Login now