Re: [PATCH 2 of 2 pypy] Fix failing test-devel-warnings.t with Pypy5.6.0

2017-07-31 Thread Augie Fackler 
Queued these for stable, thanks.

> On Jul 31, 2017, at 11:46, Boris Feld  wrote:
> 
> # HG changeset patch
> # User Boris Feld 
> # Date 1501145576 -7200
> #  Thu Jul 27 10:52:56 2017 +0200
> # Branch stable
> # Node ID f0e35277398ceab8b569651acab44de8e15eef18
> # Parent  9dfca91aab1f705652beeb9c29d213d8ff8b25aa
> # EXP-Topic pypy5.6.0-compat
> 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.
> 
> diff -r 9dfca91aab1f -r f0e35277398c tests/test-devel-warnings.t
> --- 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
> 
> ___
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 2 of 2 pypy] Fix failing test-devel-warnings.t with Pypy5.6.0

2017-07-31 Thread Boris Feld 
# HG changeset patch
# User Boris Feld 
# Date 1501145576 -7200
#  Thu Jul 27 10:52:56 2017 +0200
# Branch stable
# Node ID f0e35277398ceab8b569651acab44de8e15eef18
# Parent  9dfca91aab1f705652beeb9c29d213d8ff8b25aa
# EXP-Topic pypy5.6.0-compat
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.

diff -r 9dfca91aab1f -r f0e35277398c tests/test-devel-warnings.t
--- 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
 
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel