This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1858

tests: make hg frame optional
ClosedPublic

Authored by indygreg on Jan 14 2018, 6:04 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG15cfd343d3a9: tests: make hg frame optional
Summary

When hg is a Rust binary, the hg frame doesn't exist because an
hg Python script doesn't exist.

This commit updates expected test output to make the hg frame
optional.

There /might/ be a way to do this more accurately with the
"(feature !)" syntax in .t files. However, I poked at it for a
few minutes and couldn't get it to work. Worst case with using
(?) is we drop the frame from output for Python hg. The hg
frame isn't terribly important. So the worst case doesn't feel that
bad. If someone wants to enlighten me on how to use "(feature !)"
for optional output based on hghave features, I'd be more than
willing to update this.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 14 2018, 6:04 PM
mharbison72 added a subscriber: mharbison72.Jan 14 2018, 6:30 PM

I haven't been paying attention to the rust threads, but is there an hghave test for it? I don't see one locally. If so, then all that should be needed is appending ' (no-rust !)'. (Note the spaces.) I think this works for #test-cases too.

Note that this is *not* an "if and only if" test. If you evaluate the feature(s) listed, it will be required for '(true !)', and reverts to (?) for '(false !)'. I had a patch to make it IFF, because that's how it seems to be used in practice. But somehow I came up with a test that succeeded outside test-run-tests.t, but failed inside it.

yuja added a subscriber: yuja.Jan 15 2018, 8:05 AM

I think the frame details aren't important here, so making some lines optional
should be just fine.

Queued, thanks.

yuja accepted this revision.Jan 15 2018, 8:05 AM
This revision is now accepted and ready to land.Jan 15 2018, 8:05 AM
Closed by commit rHG15cfd343d3a9: tests: make hg frame optional (authored by indygreg). · Explain WhyJan 15 2018, 8:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-devel-warnings.t (8 lines)

Diff 4829

tests/test-devel-warnings.t

> all=0 > all=0
> check-locks=1 > check-locks=1
> EOF > EOF
$ hg buggylocking $ hg buggylocking
devel-warn: "wlock" acquired after "lock" at: $TESTTMP/buggylocking.py:* (buggylocking) (glob) devel-warn: "wlock" acquired after "lock" at: $TESTTMP/buggylocking.py:* (buggylocking) (glob)
#if no-chg #if no-chg
$ hg buggylocking --traceback $ hg buggylocking --traceback
devel-warn: "wlock" acquired after "lock" at: devel-warn: "wlock" acquired after "lock" at:
*/hg:* in <module> (glob) */hg:* in <module> (glob) (?)
*/mercurial/dispatch.py:* in run (glob) */mercurial/dispatch.py:* in run (glob)
*/mercurial/dispatch.py:* in dispatch (glob) */mercurial/dispatch.py:* in dispatch (glob)
*/mercurial/dispatch.py:* in _runcatch (glob) */mercurial/dispatch.py:* in _runcatch (glob)
*/mercurial/dispatch.py:* in _callcatch (glob) */mercurial/dispatch.py:* in _callcatch (glob)
*/mercurial/scmutil.py* in callcatch (glob) */mercurial/scmutil.py* in callcatch (glob)
*/mercurial/dispatch.py:* in _runcatchfunc (glob) */mercurial/dispatch.py:* in _runcatchfunc (glob)
*/mercurial/dispatch.py:* in _dispatch (glob) */mercurial/dispatch.py:* in _dispatch (glob)
*/mercurial/dispatch.py:* in runcommand (glob) */mercurial/dispatch.py:* in runcommand (glob)
*/mercurial/dispatch.py:* in _runcommand (glob) */mercurial/dispatch.py:* in _runcommand (glob)
*/mercurial/dispatch.py:* in <lambda> (glob) */mercurial/dispatch.py:* in <lambda> (glob)
*/mercurial/util.py:* in check (glob) */mercurial/util.py:* in check (glob)
$TESTTMP/buggylocking.py:* in buggylocking (glob) $TESTTMP/buggylocking.py:* in buggylocking (glob)
#else #else
$ hg buggylocking --traceback $ hg buggylocking --traceback
devel-warn: "wlock" acquired after "lock" at: devel-warn: "wlock" acquired after "lock" at:
*/hg:* in <module> (glob) */hg:* in <module> (glob) (?)
*/mercurial/dispatch.py:* in run (glob) */mercurial/dispatch.py:* in run (glob)
*/mercurial/dispatch.py:* in dispatch (glob) */mercurial/dispatch.py:* in dispatch (glob)
*/mercurial/dispatch.py:* in _runcatch (glob) */mercurial/dispatch.py:* in _runcatch (glob)
*/mercurial/dispatch.py:* in _callcatch (glob) */mercurial/dispatch.py:* in _callcatch (glob)
*/mercurial/scmutil.py:* in callcatch (glob) */mercurial/scmutil.py:* in callcatch (glob)
*/mercurial/dispatch.py:* in _runcatchfunc (glob) */mercurial/dispatch.py:* in _runcatchfunc (glob)
*/mercurial/dispatch.py:* in _dispatch (glob) */mercurial/dispatch.py:* in _dispatch (glob)
*/mercurial/dispatch.py:* in runcommand (glob) */mercurial/dispatch.py:* in runcommand (glob)
$ hg oldanddeprecated $ hg oldanddeprecated
devel-warn: foorbar is deprecated, go shopping devel-warn: foorbar is deprecated, go shopping
(compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob) (compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob)
#if no-chg #if no-chg
$ hg oldanddeprecated --traceback $ hg oldanddeprecated --traceback
devel-warn: foorbar is deprecated, go shopping devel-warn: foorbar is deprecated, go shopping
(compatibility will be dropped after Mercurial-42.1337, update your code.) at: (compatibility will be dropped after Mercurial-42.1337, update your code.) at:
*/hg:* in <module> (glob) */hg:* in <module> (glob) (?)
*/mercurial/dispatch.py:* in run (glob) */mercurial/dispatch.py:* in run (glob)
*/mercurial/dispatch.py:* in dispatch (glob) */mercurial/dispatch.py:* in dispatch (glob)
*/mercurial/dispatch.py:* in _runcatch (glob) */mercurial/dispatch.py:* in _runcatch (glob)
*/mercurial/dispatch.py:* in _callcatch (glob) */mercurial/dispatch.py:* in _callcatch (glob)
*/mercurial/scmutil.py* in callcatch (glob) */mercurial/scmutil.py* in callcatch (glob)
*/mercurial/dispatch.py:* in _runcatchfunc (glob) */mercurial/dispatch.py:* in _runcatchfunc (glob)
*/mercurial/dispatch.py:* in _dispatch (glob) */mercurial/dispatch.py:* in _dispatch (glob)
*/mercurial/dispatch.py:* in runcommand (glob) */mercurial/dispatch.py:* in runcommand (glob)
$ hg blackbox -l 7 $ hg blackbox -l 7
1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated 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 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) (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 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)> oldanddeprecated --traceback
1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping 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: (compatibility will be dropped after Mercurial-42.1337, update your code.) at:
*/hg:* in <module> (glob) */hg:* in <module> (glob) (?)
*/mercurial/dispatch.py:* in run (glob) */mercurial/dispatch.py:* in run (glob)
*/mercurial/dispatch.py:* in dispatch (glob) */mercurial/dispatch.py:* in dispatch (glob)
*/mercurial/dispatch.py:* in _runcatch (glob) */mercurial/dispatch.py:* in _runcatch (glob)
*/mercurial/dispatch.py:* in _callcatch (glob) */mercurial/dispatch.py:* in _callcatch (glob)
*/mercurial/scmutil.py* in callcatch (glob) */mercurial/scmutil.py* in callcatch (glob)
*/mercurial/dispatch.py:* in _runcatchfunc (glob) */mercurial/dispatch.py:* in _runcatchfunc (glob)
*/mercurial/dispatch.py:* in _dispatch (glob) */mercurial/dispatch.py:* in _dispatch (glob)
*/mercurial/dispatch.py:* in runcommand (glob) */mercurial/dispatch.py:* in runcommand (glob)