Mercurial > hg

comparison tests/test-devel-warnings.t @ 35651:15cfd343d3a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: make hg frame optional 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. Differential Revision: https://phab.mercurial-scm.org/D1858
author Gregory Szorc <gregory.szorc@gmail.com>
date Wed, 10 Jan 2018 20:02:35 -0800
parents ff2110eadbfa
children 0dde5f53b4ce
comparison
equal deleted inserted replaced
35650:4568e98b5f45 35651:15cfd343d3a9
97 $ hg buggylocking 97 $ hg buggylocking
98 devel-warn: "wlock" acquired after "lock" at: $TESTTMP/buggylocking.py:* (buggylocking) (glob) 98 devel-warn: "wlock" acquired after "lock" at: $TESTTMP/buggylocking.py:* (buggylocking) (glob)
99 #if no-chg 99 #if no-chg
100 $ hg buggylocking --traceback 100 $ hg buggylocking --traceback
101 devel-warn: "wlock" acquired after "lock" at: 101 devel-warn: "wlock" acquired after "lock" at:
102 */hg:* in <module> (glob) 102 */hg:* in <module> (glob) (?)
103 */mercurial/dispatch.py:* in run (glob) 103 */mercurial/dispatch.py:* in run (glob)
104 */mercurial/dispatch.py:* in dispatch (glob) 104 */mercurial/dispatch.py:* in dispatch (glob)
105 */mercurial/dispatch.py:* in _runcatch (glob) 105 */mercurial/dispatch.py:* in _runcatch (glob)
106 */mercurial/dispatch.py:* in _callcatch (glob) 106 */mercurial/dispatch.py:* in _callcatch (glob)
107 */mercurial/scmutil.py* in callcatch (glob) 107 */mercurial/scmutil.py* in callcatch (glob)
113 */mercurial/util.py:* in check (glob) 113 */mercurial/util.py:* in check (glob)
114 $TESTTMP/buggylocking.py:* in buggylocking (glob) 114 $TESTTMP/buggylocking.py:* in buggylocking (glob)
115 #else 115 #else
116 $ hg buggylocking --traceback 116 $ hg buggylocking --traceback
117 devel-warn: "wlock" acquired after "lock" at: 117 devel-warn: "wlock" acquired after "lock" at:
118 */hg:* in <module> (glob) 118 */hg:* in <module> (glob) (?)
119 */mercurial/dispatch.py:* in run (glob) 119 */mercurial/dispatch.py:* in run (glob)
120 */mercurial/dispatch.py:* in dispatch (glob) 120 */mercurial/dispatch.py:* in dispatch (glob)
121 */mercurial/dispatch.py:* in _runcatch (glob) 121 */mercurial/dispatch.py:* in _runcatch (glob)
122 */mercurial/dispatch.py:* in _callcatch (glob) 122 */mercurial/dispatch.py:* in _callcatch (glob)
123 */mercurial/scmutil.py:* in callcatch (glob) 123 */mercurial/scmutil.py:* in callcatch (glob)
175 175
176 #if no-chg 176 #if no-chg
177 $ hg oldanddeprecated --traceback 177 $ hg oldanddeprecated --traceback
178 devel-warn: foorbar is deprecated, go shopping 178 devel-warn: foorbar is deprecated, go shopping
179 (compatibility will be dropped after Mercurial-42.1337, update your code.) at: 179 (compatibility will be dropped after Mercurial-42.1337, update your code.) at:
180 */hg:* in <module> (glob) 180 */hg:* in <module> (glob) (?)
181 */mercurial/dispatch.py:* in run (glob) 181 */mercurial/dispatch.py:* in run (glob)
182 */mercurial/dispatch.py:* in dispatch (glob) 182 */mercurial/dispatch.py:* in dispatch (glob)
183 */mercurial/dispatch.py:* in _runcatch (glob) 183 */mercurial/dispatch.py:* in _runcatch (glob)
184 */mercurial/dispatch.py:* in _callcatch (glob) 184 */mercurial/dispatch.py:* in _callcatch (glob)
185 */mercurial/scmutil.py* in callcatch (glob) 185 */mercurial/scmutil.py* in callcatch (glob)
236 (compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob) 236 (compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob)
237 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated exited 0 after * seconds (glob) 237 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated exited 0 after * seconds (glob)
238 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback 238 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback
239 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping 239 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping
240 (compatibility will be dropped after Mercurial-42.1337, update your code.) at: 240 (compatibility will be dropped after Mercurial-42.1337, update your code.) at:
241 */hg:* in <module> (glob) 241 */hg:* in <module> (glob) (?)
242 */mercurial/dispatch.py:* in run (glob) 242 */mercurial/dispatch.py:* in run (glob)
243 */mercurial/dispatch.py:* in dispatch (glob) 243 */mercurial/dispatch.py:* in dispatch (glob)
244 */mercurial/dispatch.py:* in _runcatch (glob) 244 */mercurial/dispatch.py:* in _runcatch (glob)
245 */mercurial/dispatch.py:* in _callcatch (glob) 245 */mercurial/dispatch.py:* in _callcatch (glob)
246 */mercurial/scmutil.py* in callcatch (glob) 246 */mercurial/scmutil.py* in callcatch (glob)