test-devel-warnings: make the test compatible with chg
The test fails when run with the "--chg" option. Therefore, this
commit makes it compatible with chg.
Test Plan:
Ran the test "test-devel-warnings.t' with and without the "--chg"
option
Differential Revision: https://phab.mercurial-scm.org/D915
--- a/tests/test-devel-warnings.t Sun Oct 01 22:26:24 2017 +0100
+++ b/tests/test-devel-warnings.t Wed Oct 04 10:42:55 2017 -0700
@@ -96,9 +96,10 @@
> EOF
$ hg buggylocking
devel-warn: "wlock" acquired after "lock" at: $TESTTMP/buggylocking.py:* (buggylocking) (glob)
+#if no-chg
$ hg buggylocking --traceback
devel-warn: "wlock" acquired after "lock" at:
- */hg:* in * (glob)
+ */hg:* in <module> (glob)
*/mercurial/dispatch.py:* in run (glob)
*/mercurial/dispatch.py:* in dispatch (glob)
*/mercurial/dispatch.py:* in _runcatch (glob)
@@ -111,6 +112,43 @@
*/mercurial/dispatch.py:* in <lambda> (glob)
*/mercurial/util.py:* in check (glob)
$TESTTMP/buggylocking.py:* in buggylocking (glob)
+#else
+ $ hg buggylocking --traceback
+ devel-warn: "wlock" acquired after "lock" at:
+ */hg:* in <module> (glob)
+ */mercurial/dispatch.py:* in run (glob)
+ */mercurial/dispatch.py:* in dispatch (glob)
+ */mercurial/dispatch.py:* in _runcatch (glob)
+ */mercurial/dispatch.py:* in _callcatch (glob)
+ */mercurial/scmutil.py:* in callcatch (glob)
+ */mercurial/dispatch.py:* in _runcatchfunc (glob)
+ */mercurial/dispatch.py:* in _dispatch (glob)
+ */mercurial/dispatch.py:* in runcommand (glob)
+ */mercurial/dispatch.py:* in _runcommand (glob)
+ */mercurial/dispatch.py:* in <lambda> (glob)
+ */mercurial/util.py:* in check (glob)
+ */mercurial/commands.py:* in serve (glob)
+ */mercurial/server.py:* in runservice (glob)
+ */mercurial/commandserver.py:* in run (glob)
+ */mercurial/commandserver.py:* in _mainloop (glob)
+ */mercurial/commandserver.py:* in _runworker (glob)
+ */mercurial/commandserver.py:* in _serverequest (glob)
+ */mercurial/commandserver.py:* in serve (glob)
+ */mercurial/commandserver.py:* in serveone (glob)
+ */mercurial/chgserver.py:* in runcommand (glob)
+ */mercurial/commandserver.py:* in runcommand (glob)
+ */mercurial/dispatch.py:* in dispatch (glob)
+ */mercurial/dispatch.py:* in _runcatch (glob)
+ */mercurial/dispatch.py:* in _callcatch (glob)
+ */mercurial/scmutil.py:* in callcatch (glob)
+ */mercurial/dispatch.py:* in _runcatchfunc (glob)
+ */mercurial/dispatch.py:* in _dispatch (glob)
+ */mercurial/dispatch.py:* in runcommand (glob)
+ */mercurial/dispatch.py:* in _runcommand (glob)
+ */mercurial/dispatch.py:* in <lambda> (glob)
+ */mercurial/util.py:* in check (glob)
+ $TESTTMP/buggylocking.py:* in buggylocking (glob)
+#endif
$ hg properlocking
$ hg nowaitlocking
@@ -135,6 +173,7 @@
devel-warn: foorbar is deprecated, go shopping
(compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob)
+#if no-chg
$ hg oldanddeprecated --traceback
devel-warn: foorbar is deprecated, go shopping
(compatibility will be dropped after Mercurial-42.1337, update your code.) at:
@@ -151,6 +190,46 @@
*/mercurial/dispatch.py:* in <lambda> (glob)
*/mercurial/util.py:* in check (glob)
$TESTTMP/buggylocking.py:* in oldanddeprecated (glob)
+#else
+ $ hg oldanddeprecated --traceback
+ devel-warn: foorbar is deprecated, go shopping
+ (compatibility will be dropped after Mercurial-42.1337, update your code.) at:
+ */hg:* in <module> (glob)
+ */mercurial/dispatch.py:* in run (glob)
+ */mercurial/dispatch.py:* in dispatch (glob)
+ */mercurial/dispatch.py:* in _runcatch (glob)
+ */mercurial/dispatch.py:* in _callcatch (glob)
+ */mercurial/scmutil.py:* in callcatch (glob)
+ */mercurial/dispatch.py:* in _runcatchfunc (glob)
+ */mercurial/dispatch.py:* in _dispatch (glob)
+ */mercurial/dispatch.py:* in runcommand (glob)
+ */mercurial/dispatch.py:* in _runcommand (glob)
+ */mercurial/dispatch.py:* in <lambda> (glob)
+ */mercurial/util.py:* in check (glob)
+ */mercurial/commands.py:* in serve (glob)
+ */mercurial/server.py:* in runservice (glob)
+ */mercurial/commandserver.py:* in run (glob)
+ */mercurial/commandserver.py:* in _mainloop (glob)
+ */mercurial/commandserver.py:* in _runworker (glob)
+ */mercurial/commandserver.py:* in _serverequest (glob)
+ */mercurial/commandserver.py:* in serve (glob)
+ */mercurial/commandserver.py:* in serveone (glob)
+ */mercurial/chgserver.py:* in runcommand (glob)
+ */mercurial/commandserver.py:* in runcommand (glob)
+ */mercurial/dispatch.py:* in dispatch (glob)
+ */mercurial/dispatch.py:* in _runcatch (glob)
+ */mercurial/dispatch.py:* in _callcatch (glob)
+ */mercurial/scmutil.py:* in callcatch (glob)
+ */mercurial/dispatch.py:* in _runcatchfunc (glob)
+ */mercurial/dispatch.py:* in _dispatch (glob)
+ */mercurial/dispatch.py:* in runcommand (glob)
+ */mercurial/dispatch.py:* in _runcommand (glob)
+ */mercurial/dispatch.py:* in <lambda> (glob)
+ */mercurial/util.py:* in check (glob)
+ $TESTTMP/buggylocking.py:* in oldanddeprecated (glob)
+#endif
+
+#if no-chg
$ hg blackbox -l 7
1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated
1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping
@@ -174,6 +253,51 @@
$TESTTMP/buggylocking.py:* in oldanddeprecated (glob)
1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> blackbox -l 7
+#else
+ $ hg blackbox -l 7
+ 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated
+ 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping
+ (compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob)
+ 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated exited 0 after * seconds (glob)
+ 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback
+ 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping
+ (compatibility will be dropped after Mercurial-42.1337, update your code.) at:
+ */hg:* in <module> (glob)
+ */mercurial/dispatch.py:* in run (glob)
+ */mercurial/dispatch.py:* in dispatch (glob)
+ */mercurial/dispatch.py:* in _runcatch (glob)
+ */mercurial/dispatch.py:* in _callcatch (glob)
+ */mercurial/scmutil.py:* in callcatch (glob)
+ */mercurial/dispatch.py:* in _runcatchfunc (glob)
+ */mercurial/dispatch.py:* in _dispatch (glob)
+ */mercurial/dispatch.py:* in runcommand (glob)
+ */mercurial/dispatch.py:* in _runcommand (glob)
+ */mercurial/dispatch.py:* in <lambda> (glob)
+ */mercurial/util.py:* in check (glob)
+ */mercurial/commands.py:* in serve (glob)
+ */mercurial/server.py:* in runservice (glob)
+ */mercurial/commandserver.py:* in run (glob)
+ */mercurial/commandserver.py:* in _mainloop (glob)
+ */mercurial/commandserver.py:* in _runworker (glob)
+ */mercurial/commandserver.py:* in _serverequest (glob)
+ */mercurial/commandserver.py:* in serve (glob)
+ */mercurial/commandserver.py:* in serveone (glob)
+ */mercurial/chgserver.py:* in runcommand (glob)
+ */mercurial/commandserver.py:* in runcommand (glob)
+ */mercurial/dispatch.py:* in dispatch (glob)
+ */mercurial/dispatch.py:* in _runcatch (glob)
+ */mercurial/dispatch.py:* in _callcatch (glob)
+ */mercurial/scmutil.py:* in callcatch (glob)
+ */mercurial/dispatch.py:* in _runcatchfunc (glob)
+ */mercurial/dispatch.py:* in _dispatch (glob)
+ */mercurial/dispatch.py:* in runcommand (glob)
+ */mercurial/dispatch.py:* in _runcommand (glob)
+ */mercurial/dispatch.py:* in <lambda> (glob)
+ */mercurial/util.py:* in check (glob)
+ $TESTTMP/buggylocking.py:* in oldanddeprecated (glob)
+ 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback exited 0 after * seconds (glob)
+ 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> blackbox -l 7
+#endif
Test programming error failure: