singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY 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' with and without the "--chg" option REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D915 AFFECTED FILES tests/test-devel-warnings.t CHANGE DETAILS diff --git a/tests/test-devel-warnings.t b/tests/test-devel-warnings.t --- a/tests/test-devel-warnings.t +++ b/tests/test-devel-warnings.t @@ -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:81 in run (glob) + */mercurial/dispatch.py:163 in dispatch (glob) + */mercurial/dispatch.py:303 in _runcatch (glob) + */mercurial/dispatch.py:311 in _callcatch (glob) + */mercurial/scmutil.py:151 in callcatch (glob) + */mercurial/dispatch.py:293 in _runcatchfunc (glob) + */mercurial/dispatch.py:929 in _dispatch (glob) + */mercurial/dispatch.py:691 in runcommand (glob) + */mercurial/dispatch.py:937 in _runcommand (glob) + */mercurial/dispatch.py:926 in <lambda> (glob) + */mercurial/util.py:1180 in check (glob) + */mercurial/commands.py:4641 in serve (glob) + */mercurial/server.py:106 in runservice (glob) + */mercurial/commandserver.py:470 in run (glob) + */mercurial/commandserver.py:511 in _mainloop (glob) + */mercurial/commandserver.py:547 in _runworker (glob) + */mercurial/commandserver.py:368 in _serverequest (glob) + */mercurial/commandserver.py:292 in serve (glob) + */mercurial/commandserver.py:267 in serveone (glob) + */mercurial/chgserver.py:439 in runcommand (glob) + */mercurial/commandserver.py:250 in runcommand (glob) + */mercurial/dispatch.py:163 in dispatch (glob) + */mercurial/dispatch.py:303 in _runcatch (glob) + */mercurial/dispatch.py:311 in _callcatch (glob) + */mercurial/scmutil.py:151 in callcatch (glob) + */mercurial/dispatch.py:293 in _runcatchfunc (glob) + */mercurial/dispatch.py:929 in _dispatch (glob) + */mercurial/dispatch.py:691 in runcommand (glob) + */mercurial/dispatch.py:937 in _runcommand (glob) + */mercurial/dispatch.py:926 in <lambda> (glob) + */mercurial/util.py:1180 in check (glob) + $TESTTMP/buggylocking.py:12 in buggylocking +#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,47 @@ */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:81 in run (glob) + */mercurial/dispatch.py:163 in dispatch (glob) + */mercurial/dispatch.py:303 in _runcatch (glob) + */mercurial/dispatch.py:311 in _callcatch (glob) + */mercurial/scmutil.py:151 in callcatch (glob) + */mercurial/dispatch.py:293 in _runcatchfunc (glob) + */mercurial/dispatch.py:929 in _dispatch (glob) + */mercurial/dispatch.py:691 in runcommand (glob) + */mercurial/dispatch.py:937 in _runcommand (glob) + */mercurial/dispatch.py:926 in <lambda> (glob) + */mercurial/util.py:1180 in check (glob) + */mercurial/commands.py:4641 in serve (glob) + */mercurial/server.py:106 in runservice (glob) + */mercurial/commandserver.py:470 in run (glob) + */mercurial/commandserver.py:511 in _mainloop (glob) + */mercurial/commandserver.py:547 in _runworker (glob) + */mercurial/commandserver.py:368 in _serverequest (glob) + */mercurial/commandserver.py:292 in serve (glob) + */mercurial/commandserver.py:267 in serveone (glob) + */mercurial/chgserver.py:439 in runcommand (glob) + */mercurial/commandserver.py:250 in runcommand (glob) + */mercurial/dispatch.py:163 in dispatch (glob) + */mercurial/dispatch.py:303 in _runcatch (glob) + */mercurial/dispatch.py:311 in _callcatch (glob) + */mercurial/scmutil.py:151 in callcatch (glob) + */mercurial/dispatch.py:293 in _runcatchfunc (glob) + */mercurial/dispatch.py:929 in _dispatch (glob) + */mercurial/dispatch.py:691 in runcommand (glob) + */mercurial/dispatch.py:937 in _runcommand (glob) + */mercurial/dispatch.py:926 in <lambda> (glob) + */mercurial/util.py:1180 in check (glob) + $TESTTMP/buggylocking.py:68 in oldanddeprecated + +#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 +254,52 @@ $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:68 (oldanddeprecated) + 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:81 in run (glob) + */mercurial/dispatch.py:163 in dispatch (glob) + */mercurial/dispatch.py:303 in _runcatch (glob) + */mercurial/dispatch.py:311 in _callcatch (glob) + */mercurial/scmutil.py:151 in callcatch (glob) + */mercurial/dispatch.py:293 in _runcatchfunc (glob) + */mercurial/dispatch.py:929 in _dispatch (glob) + */mercurial/dispatch.py:691 in runcommand (glob) + */mercurial/dispatch.py:937 in _runcommand (glob) + */mercurial/dispatch.py:926 in <lambda> (glob) + */mercurial/util.py:1180 in check (glob) + */mercurial/commands.py:4641 in serve (glob) + */mercurial/server.py:106 in runservice (glob) + */mercurial/commandserver.py:470 in run (glob) + */mercurial/commandserver.py:511 in _mainloop (glob) + */mercurial/commandserver.py:547 in _runworker (glob) + */mercurial/commandserver.py:368 in _serverequest (glob) + */mercurial/commandserver.py:292 in serve (glob) + */mercurial/commandserver.py:267 in serveone (glob) + */mercurial/chgserver.py:439 in runcommand (glob) + */mercurial/commandserver.py:250 in runcommand (glob) + */mercurial/dispatch.py:163 in dispatch (glob) + */mercurial/dispatch.py:303 in _runcatch (glob) + */mercurial/dispatch.py:311 in _callcatch (glob) + */mercurial/scmutil.py:151 in callcatch (glob) + */mercurial/dispatch.py:293 in _runcatchfunc (glob) + */mercurial/dispatch.py:929 in _dispatch (glob) + */mercurial/dispatch.py:691 in runcommand (glob) + */mercurial/dispatch.py:937 in _runcommand (glob) + */mercurial/dispatch.py:926 in <lambda> (glob) + */mercurial/util.py:1180 in check (glob) + $TESTTMP/buggylocking.py:68 in oldanddeprecated + 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback exited 0 after 0.01 seconds + 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> blackbox -l 7 + +#endif Test programming error failure: To: singhsrb, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
