public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/testtools/, dev-python/testtools/files/
@ 2015-10-16 10:42 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2015-10-16 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     593acb34434672a40f55ae4a052d04715c6b345c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 10:42:12 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 10:42:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=593acb34

dev-python/testtools: Backport fices for tests

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=555424

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../files/testtools-1.8.0-twisted-backport.patch   | 74 ++++++++++++++++++++++
 dev-python/testtools/testtools-1.8.0.ebuild        |  4 ++
 2 files changed, 78 insertions(+)

diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch
new file mode 100644
index 0000000..fd65b4c
--- /dev/null
+++ b/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch
@@ -0,0 +1,74 @@
+From 25f4800d62f339f81b09c894275a3af4b284fb62 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Wed, 19 Aug 2015 03:06:09 +0100
+Subject: [PATCH] Port twisted.deferredruntest to Twisted >= 15.1.0
+
+Twisted 15.1.0 removes the compatibility import of _LogObserver in
+twisted.trial.unittest.  This is unfortunate for us, but it's what we
+get for using an internal interface.  It at least still exists in
+twisted.trial._synctest, so we can get it from there.
+
+Twisted 15.2.0 adds the new twisted.logger framework, which requires a
+slight adjustment to run_with_log_observers.  There's no longer a
+supported interface to get hold of all log observers, but since we're
+already using an internal interface (see above), what's one more?
+
+This passes "make check" with the current release, Twisted 15.3.0.
+---
+ testtools/deferredruntest.py | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/testtools/deferredruntest.py b/testtools/deferredruntest.py
+index c33e14a..04cdb0f 100644
+--- a/testtools/deferredruntest.py
++++ b/testtools/deferredruntest.py
+@@ -27,8 +27,15 @@
+     )
+ 
+ from twisted.internet import defer
++try:
++    from twisted.logger import globalLogPublisher
++except ImportError:
++    globalLogPublisher = None
+ from twisted.python import log
+-from twisted.trial.unittest import _LogObserver
++try:
++    from twisted.trial.unittest import _LogObserver
++except ImportError:
++    from twisted.trial._synctest import _LogObserver
+ 
+ 
+ class _DeferredRunTest(RunTest):
+@@ -53,9 +60,21 @@ def _run_user(self, function, *args):
+ 
+ def run_with_log_observers(observers, function, *args, **kwargs):
+     """Run 'function' with the given Twisted log observers."""
+-    real_observers = list(log.theLogPublisher.observers)
++    if globalLogPublisher is not None:
++        # Twisted >= 15.2.0, with the new twisted.logger framework.
++        # log.theLogPublisher.observers will only contain legacy observers;
++        # we need to look at globalLogPublisher._observers, which contains
++        # both legacy and modern observers, and add and remove them via
++        # globalLogPublisher.  However, we must still add and remove the
++        # observers we want to run with via log.theLogPublisher, because
++        # _LogObserver may consider old keys and require them to be mapped.
++        publisher = globalLogPublisher
++        real_observers = list(publisher._observers)
++    else:
++        publisher = log.theLogPublisher
++        real_observers = list(publisher.observers)
+     for observer in real_observers:
+-        log.theLogPublisher.removeObserver(observer)
++        publisher.removeObserver(observer)
+     for observer in observers:
+         log.theLogPublisher.addObserver(observer)
+     try:
+@@ -64,7 +83,7 @@ def run_with_log_observers(observers, function, *args, **kwargs):
+         for observer in observers:
+             log.theLogPublisher.removeObserver(observer)
+         for observer in real_observers:
+-            log.theLogPublisher.addObserver(observer)
++            publisher.addObserver(observer)
+ 
+ 
+ # Observer of the Twisted log that we install during tests.

diff --git a/dev-python/testtools/testtools-1.8.0.ebuild b/dev-python/testtools/testtools-1.8.0.ebuild
index bf31265..8c538f8 100644
--- a/dev-python/testtools/testtools-1.8.0.ebuild
+++ b/dev-python/testtools/testtools-1.8.0.ebuild
@@ -31,6 +31,10 @@ DEPEND="
 "
 RDEPEND="${CDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-twisted-backport.patch
+)
+
 python_compile_all() {
 	use doc && emake -C doc html
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/testtools/, dev-python/testtools/files/
@ 2015-10-16 10:50 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2015-10-16 10:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f052b4b412bd5b929b79299aa7076127fa1d25ce
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 10:50:17 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 10:50:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f052b4b4

dev-python/testtools: Backport some more commits needed for tests on py3

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../files/testtools-1.8.0-twisted-backport1.patch  | 33 +++++++++++++
 .../files/testtools-1.8.0-twisted-backport2.patch  | 57 ++++++++++++++++++++++
 dev-python/testtools/testtools-1.8.0.ebuild        |  2 +
 3 files changed, 92 insertions(+)

diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch
new file mode 100644
index 0000000..c1eb11b
--- /dev/null
+++ b/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch
@@ -0,0 +1,33 @@
+From 6d821b5770b01f5ec98c3b8db734fffeebf12b62 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Mon, 24 Aug 2015 13:21:57 +0100
+Subject: [PATCH] Test with Twisted 13.0.0/15.2.0.
+
+---
+ .travis.yml | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 41036f8..a706b27 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -7,6 +7,10 @@ python:
+   - "3.4"
+   - "pypy"
+ 
++env:
++  - TWISTED="==13.0.0"
++  - TWISTED="==15.2.0"
++
+ # We have to pin Jinja2 < 2.7  for Python 3.2 because 2.7 drops/breaks support:
+ # http://jinja.pocoo.org/docs/changelog/#version-2-7
+ # And Spinx to < 1.3 for pypy3 and python 3.2 similarly.
+@@ -23,7 +27,7 @@ matrix:
+       env: SPHINX="<1.3"
+ 
+ install:
+-  - pip install fixtures $JINJA_REQ sphinx$SPHINX
++  - pip install fixtures $JINJA_REQ sphinx$SPHINX Twisted$TWISTED
+   - python setup.py install
+ 
+ script:

diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch
new file mode 100644
index 0000000..df5d91f
--- /dev/null
+++ b/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch
@@ -0,0 +1,57 @@
+From 2e03ffaff15bc5d83c5f6d092aab4072f166aca0 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Mon, 24 Aug 2015 13:45:01 +0100
+Subject: [PATCH] Only run Twisted tests on Python 2.
+
+---
+ .travis.yml | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index a706b27..bc007f2 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -7,27 +7,37 @@ python:
+   - "3.4"
+   - "pypy"
+ 
+-env:
+-  - TWISTED="==13.0.0"
+-  - TWISTED="==15.2.0"
+-
+ # We have to pin Jinja2 < 2.7  for Python 3.2 because 2.7 drops/breaks support:
+ # http://jinja.pocoo.org/docs/changelog/#version-2-7
+-# And Spinx to < 1.3 for pypy3 and python 3.2 similarly.
++# And Sphinx to < 1.3 for pypy3 and python 3.2 similarly.
+ #
+ # See also:
+ # http://stackoverflow.com/questions/18252804/syntax-error-in-jinja-2-library
++#
++# Twisted tests currently only work on Python 2.
+ matrix:
+   include:
++    - python: "2.6"
++      env:
++        - TWISTED_REQ="Twisted==13.0.0"
++        - TWISTED_REQ="Twisted==15.2.0"
++    - python: "2.7"
++      env:
++        - TWISTED_REQ="Twisted==13.0.0"
++        - TWISTED_REQ="Twisted==15.2.0"
+     - python: "3.2"
+       env:
+         - JINJA_REQ="jinja2<2.7, Pygments<2.0"
+         - SPHINX="<1.3"
++    - python: "pypy"
++      env:
++        - TWISTED_REQ="Twisted==13.0.0"
++        - TWISTED_REQ="Twisted==15.2.0"
+     - python: "pypy3"
+       env: SPHINX="<1.3"
+ 
+ install:
+-  - pip install fixtures $JINJA_REQ sphinx$SPHINX Twisted$TWISTED
++  - pip install fixtures $JINJA_REQ sphinx$SPHINX $TWISTED_REQ
+   - python setup.py install
+ 
+ script:

diff --git a/dev-python/testtools/testtools-1.8.0.ebuild b/dev-python/testtools/testtools-1.8.0.ebuild
index 8c538f8..33679b9 100644
--- a/dev-python/testtools/testtools-1.8.0.ebuild
+++ b/dev-python/testtools/testtools-1.8.0.ebuild
@@ -33,6 +33,8 @@ RDEPEND="${CDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-twisted-backport.patch
+	"${FILESDIR}"/${P}-twisted-backport1.patch
+	"${FILESDIR}"/${P}-twisted-backport2.patch
 )
 
 python_compile_all() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/testtools/, dev-python/testtools/files/
@ 2018-07-12 21:54 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2018-07-12 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     10ab70cfc107dddbdbc4dae4a40de7df5788a708
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 21:49:53 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 21:54:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10ab70cf

dev-python/testtools: Backport py3.7 test fix

 .../testtools/files/testtools-2.3.0-py37.patch     | 44 ++++++++++++++++++++++
 dev-python/testtools/testtools-2.3.0.ebuild        |  6 ++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/dev-python/testtools/files/testtools-2.3.0-py37.patch b/dev-python/testtools/files/testtools-2.3.0-py37.patch
new file mode 100644
index 00000000000..0f2da043ffe
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.3.0-py37.patch
@@ -0,0 +1,44 @@
+https://github.com/testing-cabal/testtools/commit/29004731f9c480b7c44a9c2605513d50d372898f.patch
+
+From 29004731f9c480b7c44a9c2605513d50d372898f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Thu, 17 May 2018 17:52:26 +0200
+Subject: [PATCH] Fix the tests on Python 3.7
+
+Exception's repr got changed not to include trailing comma
+
+Fixes https://github.com/testing-cabal/testtools/issues/270
+---
+ .travis.yml                                |  1 +
+ testtools/tests/matchers/test_exception.py | 11 +++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/testtools/tests/matchers/test_exception.py b/testtools/tests/matchers/test_exception.py
+index 6cd80af1..acd39252 100644
+--- a/testtools/tests/matchers/test_exception.py
++++ b/testtools/tests/matchers/test_exception.py
+@@ -32,15 +32,22 @@ class TestMatchesExceptionInstanceInterface(TestCase, TestMatchersInterface):
+     matches_matches = [error_foo]
+     matches_mismatches = [error_bar, error_base_foo]
+ 
++    if sys.version_info >= (3, 7):
++        # exception's repr has changed
++        _e = ''
++    else:
++        _e = ','
++
+     str_examples = [
+-        ("MatchesException(Exception('foo',))",
++        ("MatchesException(Exception('foo'%s))" % _e,
+          MatchesException(Exception('foo')))
+         ]
+     describe_examples = [
+         ("%r is not a %r" % (Exception, ValueError),
+          error_base_foo,
+          MatchesException(ValueError("foo"))),
+-        ("ValueError('bar',) has different arguments to ValueError('foo',).",
++        ("ValueError('bar'%s) has different arguments to ValueError('foo'%s)."
++         % (_e, _e),
+          error_bar,
+          MatchesException(ValueError("foo"))),
+         ]

diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
index 0ec501a3f0e..e37da41b3e7 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,10 @@ DEPEND="
 RDEPEND="${CDEPEND}"
 PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
 
+PATCHES=(
+	"${FILESDIR}"/testtools-2.3.0-py37.patch
+)
+
 python_compile_all() {
 	use doc && emake -C doc html
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/testtools/, dev-python/testtools/files/
@ 2021-08-16  6:38 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2021-08-16  6:38 UTC (permalink / raw
  To: gentoo-commits

commit:     45d8330c5eedc63d84b6095c6c7c4aeb2584ab45
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 06:28:33 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 06:38:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d8330c

dev-python/testtools: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/testtools/Manifest                      |  1 -
 .../files/testtools-2.4.0-assertitemsequal.patch   | 27 --------
 .../testtools/files/testtools-2.4.0-py310.patch    | 43 ------------
 .../testtools/files/testtools-2.4.0-py39.patch     | 76 ----------------------
 dev-python/testtools/testtools-2.4.0-r2.ebuild     | 64 ------------------
 5 files changed, 211 deletions(-)

diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 5e305b71344..2869c469f74 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,2 +1 @@
-DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
 DIST testtools-2.5.0.tar.gz 235399 BLAKE2B 62d62cd12f19eb3fad419dc06e7f0152bf8f70a9f60927b1d791f2905b34e13199ceac93b3d30735acae2c5db1e8554cc5a7f6c8588d1f05fb213c424e90a12b SHA512 6adbf9e90f0647a44130e99cd94e4c0cbfab3a1b5c28b6bb124d061defe69d8043186cfe554099936effe16a6b07d59927bfeb6820f5a0fb34970ff243030fd4

diff --git a/dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch b/dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch
deleted file mode 100644
index e46bf29c8bf..00000000000
--- a/dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2ead7c11a54b0860e02992212e302c4a7bd26c35 Mon Sep 17 00:00:00 2001
-From: Matthew Treinish <mtreinish@kortar.org>
-Date: Wed, 8 Jul 2020 14:22:24 -0400
-Subject: [PATCH] Update testtools/testcase.py
-
-Co-authored-by: Thomas Grainger <tagrain@gmail.com>
----
- testtools/testcase.py | 1 +
- 1 file changed, 1 insertion(+)
-
-Rebased for 2.4.0 by Michał Górny (eliminating intermediate commits).
-
-diff --git a/testtools/testcase.py b/testtools/testcase.py
-index bff5be2..22e9143 100644
---- a/testtools/testcase.py
-+++ b/testtools/testcase.py
-@@ -501,6 +501,7 @@ class TestCase(unittest.TestCase):
-         if mismatch_error is not None:
-             raise mismatch_error
- 
-+    assertItemsEqual = unittest.TestCase.assertCountEqual
-     def addDetailUniqueName(self, name, content_object):
-         """Add a detail to the test, but ensure it's name is unique.
- 
--- 
-2.32.0
-

diff --git a/dev-python/testtools/files/testtools-2.4.0-py310.patch b/dev-python/testtools/files/testtools-2.4.0-py310.patch
deleted file mode 100644
index d2d0c092d14..00000000000
--- a/dev-python/testtools/files/testtools-2.4.0-py310.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d528842b99b16efce212e15dae3f0a54927d06d8 Mon Sep 17 00:00:00 2001
-From: Cyril Roelandt <cyril@redhat.com>
-Date: Fri, 19 Mar 2021 02:50:13 +0000
-Subject: [PATCH] Fix tests with Python 3.10
-
-In Python 3, error messages have become a bit more precise. For
-instance, the following code snippet:
-
-----
-class Foo():
-    def bar(self, a):
-        pass
-
-try:
-    Foo().bar(1, 2)
-except TypeError as e:
-    print(e)
-----
-
-will return:
-
-- in Python 3.9: "bar() takes 2 positional arguments but 3 were given"
-- in Python 3.10: "Foo.bar() takes 2 positional arguments but 3 were
-  given"
-
-Fix our tests accordingly.
----
- testtools/tests/test_testsuite.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testtools/tests/test_testsuite.py b/testtools/tests/test_testsuite.py
-index 7ad5b74d..65cb88d7 100644
---- a/testtools/tests/test_testsuite.py
-+++ b/testtools/tests/test_testsuite.py
-@@ -181,7 +181,7 @@ def run(self):
-     test.run(process_result)
- """, doctest.ELLIPSIS))
-         self.assertThat(events[3][6].decode('utf8'), DocTestMatches("""\
--TypeError: run() takes ...1 ...argument...2...given...
-+TypeError: ...run() takes ...1 ...argument...2...given...
- """, doctest.ELLIPSIS))
-         events = [event[0:10] + (None,) for event in events]
-         events[1] = events[1][:6] + (None,) + events[1][7:]

diff --git a/dev-python/testtools/files/testtools-2.4.0-py39.patch b/dev-python/testtools/files/testtools-2.4.0-py39.patch
deleted file mode 100644
index a502e1cc063..00000000000
--- a/dev-python/testtools/files/testtools-2.4.0-py39.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 1d698cf91cb2205aedc018e465a2e17c5a6a3e94 Mon Sep 17 00:00:00 2001
-From: Michel Alexandre Salim <michel@michel-slm.name>
-Date: Sat, 16 May 2020 13:21:38 -0700
-Subject: [PATCH] Fix syntax error test for Python 3.9
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On Python 3.9 the zero-width no-break space Unicode character U+FEFF
-does not get printed in syntax errors.
-
-See:
-https://bugzilla.redhat.com/show_bug.cgi?id=1831126
-
-This is reproducible in a virtual environment as well.
-
-Before:
-```
-.venv ❯ make check
-PYTHONPATH=/home/michel/src/github/testing-cabal/testtools python -m testtools.run testtools.tests.test_suite
-/usr/lib64/python3.9/runpy.py:127: RuntimeWarning: 'testtools.run' found in sys.modules after import of package 'testtools', but prior to execution of 'testtools.run'; this may result in unpredictable behaviour
-  warn(RuntimeWarning(msg))
-Tests running...
-======================================================================
-FAIL: testtools.tests.test_testresult.TestNonAsciiResults.test_syntax_error_line_utf_8
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/home/michel/src/github/testing-cabal/testtools/testtools/tests/test_testresult.py", line 2744, in test_syntax_error_line_utf_8
-    self.assertThat(
-  File "/home/michel/src/github/testing-cabal/testtools/testtools/testcase.py", line 499, in assertThat
-    raise mismatch_error
-testtools.matchers._impl.MismatchError: 'Tests running...\n======================================================================\nERROR: test_syntax_error_line_utf_8.Test.runTest\n----------------------------------------------------------------------\nTraceback (most recent call last):\n  File "/tmp/TestNonAsciiResultsblblh75h/test_syntax_error_line_utf_8.py", line 6, in runTest\n    import bad\n  File "/tmp/TestNonAsciiResultsblblh75h/bad.py", line 1\n    \ufeff^ = 0 # paɪθən\n    ^\nSyntaxError: invalid syntax\n\nRan 1 test in 0.001s\nFAILED (failures=1)\n' does not match /.*bad.py", line 1\n\s*\^ = 0 # pa\u026a\u03b8\u0259n\n \s*\^\nSyntaxError:.*/
-======================================================================
-FAIL: testtools.tests.test_testresult.TestNonAsciiResultsWithUnittest.test_syntax_error_line_utf_8
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/home/michel/src/github/testing-cabal/testtools/testtools/tests/test_testresult.py", line 2744, in test_syntax_error_line_utf_8
-    self.assertThat(
-  File "/home/michel/src/github/testing-cabal/testtools/testtools/testcase.py", line 499, in assertThat
-    raise mismatch_error
-testtools.matchers._impl.MismatchError: 'E\n======================================================================\nERROR: runTest (test_syntax_error_line_utf_8.Test)\ntest_syntax_error_line_utf_8.Test.runTest\n----------------------------------------------------------------------\ntesttools.testresult.real._StringException: Traceback (most recent call last):\n  File "/tmp/TestNonAsciiResultsWithUnittest_zzswpmj/test_syntax_error_line_utf_8.py", line 6, in runTest\n    import bad\n  File "/tmp/TestNonAsciiResultsWithUnittest_zzswpmj/bad.py", line 1\n    \ufeff^ = 0 # paɪθən\n    ^\nSyntaxError: invalid syntax\n\n\n----------------------------------------------------------------------\nRan 1 test in 0.000s\n\nFAILED (errors=1)\n' does not match /.*bad.py", line 1\n\s*\^ = 0 # pa\u026a\u03b8\u0259n\n \s*\^\nSyntaxError:.*/
-
-Ran 2627 tests in 0.569s
-FAILED (failures=2)
-make: *** [Makefile:7: check] Error 1
-```
-
-After:
-```
-.venv ❯ make check
-PYTHONPATH=/home/michel/src/github/testing-cabal/testtools python -m testtools.run testtools.tests.test_suite
-/usr/lib64/python3.9/runpy.py:127: RuntimeWarning: 'testtools.run' found in sys.modules after import of package 'testtools', but prior to execution of 'testtools.run'; this may result in unpredictable behaviour
-  warn(RuntimeWarning(msg))
-Tests running...
-
-Ran 2627 tests in 0.492s
-OK
-```
----
- testtools/tests/test_testresult.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py
-index 3bbd8937..deceb07d 100644
---- a/testtools/tests/test_testresult.py
-+++ b/testtools/tests/test_testresult.py
-@@ -2741,6 +2741,9 @@ def test_syntax_error_line_utf_8(self):
-         textoutput = self._setup_external_case("import bad")
-         self._write_module("bad", "utf-8", "\ufeff^ = 0 # %s\n" % text)
-         textoutput = self._run_external_case()
-+        # Python 3.9 no longer prints the '\ufeff'
-+        if sys.version_info >= (3,9):
-+            textoutput = textoutput.replace('\ufeff', '')
-         self.assertThat(
-             textoutput,
-             MatchesRegex(

diff --git a/dev-python/testtools/testtools-2.4.0-r2.ebuild b/dev-python/testtools/testtools-2.4.0-r2.ebuild
deleted file mode 100644
index 7f2830ce2d4..00000000000
--- a/dev-python/testtools/testtools-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the Python standard library unit testing framework"
-HOMEPAGE="https://github.com/testing-cabal/testtools"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/testtools-2.4.0-py39.patch
-	"${FILESDIR}"/testtools-2.4.0-py310.patch
-	"${FILESDIR}"/testtools-2.4.0-assertitemsequal.patch
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests unittest
-
-src_prepare() {
-	# eliminate unittest2 & traceback2
-	sed -i -e '/unittest2/d' -e '/traceback2/d' requirements.txt || die
-	# eliminate linecache2
-	sed -i -e 's/import linecache2 as linecache/import linecache/' \
-		testtools/tests/test_compat.py || die
-
-	# also conditional imports
-	find -name '*.py' -exec \
-		sed -i -e 's:unittest2:unittest:' {} + || die
-	sed -i -e 's/^traceback =.*/import traceback/' \
-		testtools/content.py || die
-	# py3.10 changed the output
-	sed -i -e 's:test_syntax_error:_&:' \
-		testtools/tests/test_testresult.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite ||
-		die "tests failed under ${EPYTHON}"
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/testtools/, dev-python/testtools/files/
@ 2022-05-21 11:22 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2022-05-21 11:22 UTC (permalink / raw
  To: gentoo-commits

commit:     75bb6d5fca7fecaa87e51590e0503ee6dd949eea
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 10:47:07 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 21 11:22:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75bb6d5f

dev-python/testtools: Enable py3.11

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../testtools/files/testtools-2.5.0-py311.patch    | 116 +++++++++++++++++++++
 dev-python/testtools/testtools-2.5.0-r1.ebuild     |   9 +-
 2 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/dev-python/testtools/files/testtools-2.5.0-py311.patch b/dev-python/testtools/files/testtools-2.5.0-py311.patch
new file mode 100644
index 000000000000..ee457f6119c3
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.5.0-py311.patch
@@ -0,0 +1,116 @@
+From 77953cf633ecd149b2c29e616f8d9d4e0cf8e5fa Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Sat, 23 Apr 2022 22:53:48 +0100
+Subject: [PATCH] Fix various test failures with Python 3.11
+
+The changes for https://peps.python.org/pep-0657/ require a number of
+changes in our tests.
+
+Some tests still fail due to
+https://twistedmatrix.com/trac/ticket/10336, so I'm not adding
+3.11 to the test matrix yet.
+
+Fixes #325.
+---
+ testtools/tests/test_run.py        |  4 ++--
+ testtools/tests/test_testresult.py | 23 +++++++++++++----------
+ testtools/tests/test_testsuite.py  |  2 +-
+ 3 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/testtools/tests/test_run.py b/testtools/tests/test_run.py
+index ee96eec9..9808421b 100644
+--- a/testtools/tests/test_run.py
++++ b/testtools/tests/test_run.py
+@@ -202,9 +202,9 @@ def test_run_list_failed_import(self):
+ Failed to import test module: runexample
+ Traceback (most recent call last):
+   File ".../loader.py", line ..., in _find_test_path
+-    package = self._get_module_from_name(name)
++    package = self._get_module_from_name(name)...
+   File ".../loader.py", line ..., in _get_module_from_name
+-    __import__(name)
++    __import__(name)...
+   File ".../runexample/__init__.py", line 1
+     class not in
+ ...^...
+diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py
+index 4fbf15d1..7824ff46 100644
+--- a/testtools/tests/test_testresult.py
++++ b/testtools/tests/test_testresult.py
+@@ -1266,11 +1266,11 @@ def test_traceback_formatting_without_stack_hidden(self):
+             DocTestMatches(
+                 'Traceback (most recent call last):\n'
+                 '  File "...testtools...runtest.py", line ..., in _run_user\n'
+-                '    return fn(*args, **kwargs)\n'
++                '    return fn(*args, **kwargs)\n...'
+                 '  File "...testtools...testcase.py", line ..., in _run_test_method\n'
+-                '    return self._get_test_method()()\n'
++                '    return self._get_test_method()()\n...'
+                 '  File "...testtools...tests...test_testresult.py", line ..., in error\n'
+-                '    1/0\n'
++                '    1/0\n...'
+                 'ZeroDivisionError: ...\n',
+                 doctest.ELLIPSIS | doctest.REPORT_UDIFF))
+ 
+@@ -1283,7 +1283,7 @@ def test_traceback_formatting_with_stack_hidden(self):
+             DocTestMatches(
+                 'Traceback (most recent call last):\n'
+                 '  File "...testtools...tests...test_testresult.py", line ..., in error\n'
+-                '    1/0\n'
++                '    1/0\n...'
+                 'ZeroDivisionError: ...\n',
+                 doctest.ELLIPSIS))
+ 
+@@ -1322,17 +1322,17 @@ def test_traceback_with_locals(self):
+             DocTestMatches(
+                 'Traceback (most recent call last):\n'
+                 '  File "...testtools...runtest.py", line ..., in _run_user\n'
+-                '    return fn(*args, **kwargs)\n'
++                '    return fn(*args, **kwargs)\n...'
+                 '    args = ...\n'
+                 '    fn = ...\n'
+                 '    kwargs = ...\n'
+                 '    self = ...\n'
+                 '  File "...testtools...testcase.py", line ..., in _run_test_method\n'
+-                '    return self._get_test_method()()\n'
++                '    return self._get_test_method()()\n...'
+                 '    result = ...\n'
+                 '    self = ...\n'
+                 '  File "...testtools...tests...test_testresult.py", line ..., in error\n'
+-                '    1/0\n'
++                '    1/0\n...'
+                 '    a = 1\n'
+                 '    self = ...\n'
+                 'ZeroDivisionError: ...\n',
+@@ -2645,12 +2645,15 @@ def test_unprintable_exception(self):
+             "        raise RuntimeError\n"
+             "    def __repr__(self):\n"
+             "        raise RuntimeError\n")
++        if sys.version_info >= (3, 11):
++            expected = "UnprintableError: <exception str() failed>\n"
++        else:
++            expected = (
++                "UnprintableError: <unprintable UnprintableError object>\n")
+         textoutput = self._test_external_case(
+             modulelevel=exception_class,
+             testline="raise UnprintableError")
+-        self.assertIn(self._as_output(
+-            "UnprintableError: <unprintable UnprintableError object>\n"),
+-            textoutput)
++        self.assertIn(self._as_output(expected), textoutput)
+ 
+     def test_non_ascii_dirname(self):
+         """Script paths in the traceback can be non-ascii"""
+diff --git a/testtools/tests/test_testsuite.py b/testtools/tests/test_testsuite.py
+index 65cb88d7..01abb23c 100644
+--- a/testtools/tests/test_testsuite.py
++++ b/testtools/tests/test_testsuite.py
+@@ -178,7 +178,7 @@ def run(self):
+             "Traceback (most recent call last):\n")
+         self.assertThat(events[2][6].decode('utf8'), DocTestMatches("""\
+   File "...testtools/testsuite.py", line ..., in _run_test
+-    test.run(process_result)
++    test.run(process_result)...
+ """, doctest.ELLIPSIS))
+         self.assertThat(events[3][6].decode('utf8'), DocTestMatches("""\
+ TypeError: ...run() takes ...1 ...argument...2...given...

diff --git a/dev-python/testtools/testtools-2.5.0-r1.ebuild b/dev-python/testtools/testtools-2.5.0-r1.ebuild
index 5b4ff96df657..a6fe6fe82954 100644
--- a/dev-python/testtools/testtools-2.5.0-r1.ebuild
+++ b/dev-python/testtools/testtools-2.5.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -41,8 +41,13 @@ PDEPEND="
 
 distutils_enable_sphinx doc
 
+PATCHES=(
+	# https://github.com/testing-cabal/testtools/pull/328
+	"${FILESDIR}"/${P}-py311.patch
+)
+
 src_prepare() {
-	# very fragile to formatting changes
+	# very fragile to formatting changes (broken on py3.10 & pypy3)
 	sed -i -e 's:test_syntax_error(:_&:' \
 		testtools/tests/test_testresult.py || die
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/testtools/, dev-python/testtools/files/
@ 2024-07-01 13:14 Petr Vaněk
  0 siblings, 0 replies; 6+ messages in thread
From: Petr Vaněk @ 2024-07-01 13:14 UTC (permalink / raw
  To: gentoo-commits

commit:     3efda587bb8a8816f04ce2f9a056d57bb94f960e
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  1 12:41:02 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 13:14:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3efda587

dev-python/testtools: extend twisted test dep to py3.13

Some tests need to be addapted for dev-python/twisted-24.3.0_p20240628
snapshot we have in our tree. The patch is backported from upstream.

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 .../files/testtools-2.7.2-twisted-fix.patch        | 45 ++++++++++++++++++++++
 dev-python/testtools/testtools-2.7.2.ebuild        |  8 ++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch b/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch
new file mode 100644
index 000000000000..bbf943be60d1
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch
@@ -0,0 +1,45 @@
+From 5b8cb6497c7159f593e68de6a13e15f7e78e56e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Mon, 1 Jul 2024 10:00:05 +0200
+Subject: [PATCH] Prepare tests for upcoming twisted version
+
+Twisted recently changed behavior of logger on failures [1]. It newly
+logs the `Main loop terminated.` even on exceptions, which breaks two
+test in twistedsupport test suite. This hack attempts to address the
+upcoming issue.
+
+[1] https://github.com/twisted/twisted/pull/12207
+
+Upstream-PR: https://github.com/testing-cabal/testtools/pull/387
+
+diff --git a/testtools/tests/twistedsupport/test_runtest.py b/testtools/tests/twistedsupport/test_runtest.py
+index 4b46cc64..f8faf7c6 100644
+--- a/testtools/tests/twistedsupport/test_runtest.py
++++ b/testtools/tests/twistedsupport/test_runtest.py
+@@ -16,7 +16,6 @@
+     Contains,
+     ContainsAll,
+     ContainsDict,
+-    EndsWith,
+     Equals,
+     Is,
+     KeysEqual,
+@@ -749,7 +748,7 @@ def test_something(self):
+                     test,
+                     {
+                         "traceback": Not(Is(None)),
+-                        "twisted-log": AsText(EndsWith(" foo\n")),
++                        "twisted-log": AsText(Contains(" foo\n")),
+                     },
+                 ),
+                 ("stopTest", test),
+@@ -790,7 +789,8 @@ def test_something(self):
+         result = self.make_result()
+         runner.run(result)
+         self.assertThat(
+-            messages, MatchesListwise([ContainsDict({"message": Equals(("foo",))})])
++            messages[0:1],
++            MatchesListwise([ContainsDict({"message": Equals(("foo",))})]),
+         )
+ 
+     def test_restore_observers(self):

diff --git a/dev-python/testtools/testtools-2.7.2.ebuild b/dev-python/testtools/testtools-2.7.2.ebuild
index f9c9a6886024..d26da3f05732 100644
--- a/dev-python/testtools/testtools-2.7.2.ebuild
+++ b/dev-python/testtools/testtools-2.7.2.ebuild
@@ -27,12 +27,14 @@ BDEPEND="
 		>=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
 		dev-python/testscenarios[${PYTHON_USEDEP}]
 		dev-python/testresources[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' 3.{10..12})
+		dev-python/twisted[${PYTHON_USEDEP}]
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.7.2-twisted-fix.patch"
+)
+
 distutils_enable_sphinx doc
 
 python_test() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-01 13:15 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-16 10:42 [gentoo-commits] repo/gentoo:master commit in: dev-python/testtools/, dev-python/testtools/files/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2015-10-16 10:50 Justin Lecher
2018-07-12 21:54 Michał Górny
2021-08-16  6:38 Michał Górny
2022-05-21 11:22 Michał Górny
2024-07-01 13:14 Petr Vaněk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox