##// END OF EJS Templates
pypy: fix failing test-devel-warnings.t with Pypy5.6.0...
Boris Feld -
r33610:d524cd1d stable
parent child Browse files
Show More
@@ -129,7 +129,7 b' Stripping from a transaction'
129 $ hg commit -m a
129 $ hg commit -m a
130 $ hg stripintr 2>&1 | egrep -v '^(\*\*| )'
130 $ hg stripintr 2>&1 | egrep -v '^(\*\*| )'
131 Traceback (most recent call last):
131 Traceback (most recent call last):
132 mercurial.error.ProgrammingError: cannot strip from inside a transaction
132 *ProgrammingError: cannot strip from inside a transaction (glob)
133
133
134 $ hg oldanddeprecated
134 $ hg oldanddeprecated
135 devel-warn: foorbar is deprecated, go shopping
135 devel-warn: foorbar is deprecated, go shopping
@@ -187,7 +187,7 b' Test programming error failure:'
187 ** Extensions loaded: * (glob)
187 ** Extensions loaded: * (glob)
188 ** ProgrammingError: transaction requires locking
188 ** ProgrammingError: transaction requires locking
189 Traceback (most recent call last):
189 Traceback (most recent call last):
190 mercurial.error.ProgrammingError: transaction requires locking
190 *ProgrammingError: transaction requires locking (glob)
191
191
192 $ hg programmingerror 2>&1 | egrep -v '^ '
192 $ hg programmingerror 2>&1 | egrep -v '^ '
193 ** Unknown exception encountered with possibly-broken third-party extension buggylocking
193 ** Unknown exception encountered with possibly-broken third-party extension buggylocking
@@ -200,7 +200,7 b' Test programming error failure:'
200 ** ProgrammingError: something went wrong
200 ** ProgrammingError: something went wrong
201 ** (try again)
201 ** (try again)
202 Traceback (most recent call last):
202 Traceback (most recent call last):
203 mercurial.error.ProgrammingError: something went wrong
203 *ProgrammingError: something went wrong (glob)
204
204
205 Old style deprecation warning
205 Old style deprecation warning
206
206
General Comments 0
You need to be logged in to leave comments. Login now