diff tests/test-blackbox.t @ 44129:84a0102c05c7 stable 5.3rc0

merge to stable for 5.3 release freeze

--- a/tests/test-blackbox.t	Thu Jan 09 14:19:20 2020 -0500
+++ b/tests/test-blackbox.t	Tue Jan 21 13:14:51 2020 -0500
@@ -57,8 +57,15 @@
 
 unhandled exception
   $ rm ./.hg/blackbox.log
-  $ hg crash 2> /dev/null
+#if chg
+ (chg exits 255 because it fails to receive an exit code)
+  $ hg crash 2>/dev/null
+  [255]
+#else
+ (hg exits 1 because Python default exit code for uncaught exception is 1)
+  $ hg crash 2>/dev/null
   [1]
+#endif
   $ hg blackbox -l 2
   1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> crash exited 1 after * seconds (glob)
   1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> blackbox -l 2
@@ -390,7 +397,7 @@
   > from mercurial import registrar, scmutil
   > cmdtable = {}
   > command = registrar.command(cmdtable)
-  > @command('noop')
+  > @command(b'noop')
   > def noop(ui, repo):
   >     pass
   > EOF