Mercurial > hg-stable
changeset 33608:d524cd1d1648 stable
pypy: fix failing test-devel-warnings.t with Pypy5.6.0
In Pypy 5.6.0, traceback exception classes are not displayed with their full
qualified name.
Instead of displaying mercurial.error.ProgrammingError, Pypy displays
ProgrammingError.
Update the test to support both version.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 27 Jul 2017 10:52:56 +0200 |
| parents | 6c142f279625 |
| children | a72b2db1a6a9 |
| files | tests/test-devel-warnings.t |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-devel-warnings.t Mon Jul 31 17:43:45 2017 +0200 +++ b/tests/test-devel-warnings.t Thu Jul 27 10:52:56 2017 +0200 @@ -129,7 +129,7 @@ $ hg commit -m a $ hg stripintr 2>&1 | egrep -v '^(\*\*| )' Traceback (most recent call last): - mercurial.error.ProgrammingError: cannot strip from inside a transaction + *ProgrammingError: cannot strip from inside a transaction (glob) $ hg oldanddeprecated devel-warn: foorbar is deprecated, go shopping @@ -187,7 +187,7 @@ ** Extensions loaded: * (glob) ** ProgrammingError: transaction requires locking Traceback (most recent call last): - mercurial.error.ProgrammingError: transaction requires locking + *ProgrammingError: transaction requires locking (glob) $ hg programmingerror 2>&1 | egrep -v '^ ' ** Unknown exception encountered with possibly-broken third-party extension buggylocking @@ -200,7 +200,7 @@ ** ProgrammingError: something went wrong ** (try again) Traceback (most recent call last): - mercurial.error.ProgrammingError: something went wrong + *ProgrammingError: something went wrong (glob) Old style deprecation warning