You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
94 lines
3.6 KiB
94 lines
3.6 KiB
1 month ago
|
From e2d4885440367f66df9231a00a5d36ee1374c79d Mon Sep 17 00:00:00 2001
|
||
|
|
From: dieter <dieter.maurer@online.de>
|
||
|
|
Date: Mon, 3 Jun 2024 10:31:24 +0200
|
||
|
|
Subject: [PATCH 1/2] fix `subunit` tests for Python 3.13
|
||
|
|
|
||
|
|
---
|
||
|
|
src/zope/testrunner/tests/test_doctest.py | 6 ++++++
|
||
|
|
src/zope/testrunner/tests/testrunner-subunit-v2.rst | 2 +-
|
||
|
|
src/zope/testrunner/tests/testrunner-subunit.rst | 2 +-
|
||
|
|
3 files changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/zope/testrunner/tests/test_doctest.py b/src/zope/testrunner/tests/test_doctest.py
|
||
|
|
index 14a5a52..ef8d486 100644
|
||
|
|
--- a/src/zope/testrunner/tests/test_doctest.py
|
||
|
|
+++ b/src/zope/testrunner/tests/test_doctest.py
|
||
|
|
@@ -86,6 +86,9 @@
|
||
|
|
re.MULTILINE),
|
||
|
|
r''),
|
||
|
|
# (re.compile('^> [^\n]+->None$', re.M), '> ...->None'),
|
||
|
|
+
|
||
|
|
+ # disregard trailing whitespace
|
||
|
|
+ (re.compile(r'\s*$'), ''),
|
||
|
|
])
|
||
|
|
else:
|
||
|
|
# *nix
|
||
|
|
@@ -132,6 +135,9 @@
|
||
|
|
r'(/__init__)?.py{\w+}", [^\n]+\n[^\n]+\n',
|
||
|
|
re.MULTILINE),
|
||
|
|
r''),
|
||
|
|
+
|
||
|
|
+ # disregard trailing whitespace
|
||
|
|
+ (re.compile(r'\s*$', re.MULTILINE), ''),
|
||
|
|
])
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/zope/testrunner/tests/testrunner-subunit-v2.rst b/src/zope/testrunner/tests/testrunner-subunit-v2.rst
|
||
|
|
index 2263a1a..71feb97 100644
|
||
|
|
--- a/src/zope/testrunner/tests/testrunner-subunit-v2.rst
|
||
|
|
+++ b/src/zope/testrunner/tests/testrunner-subunit-v2.rst
|
||
|
|
@@ -458,7 +458,7 @@ Let's run tests including a module with some bad syntax:
|
||
|
|
Traceback (most recent call last):
|
||
|
|
File "/home/benji/workspace/all-the-trunks/zope.testrunner/src/zope/testrunner/testrunner-ex/sample2/sample23/sampletests_i.py", line 17, in <module>
|
||
|
|
class Test(unittest.TestCase):
|
||
|
|
- File "/home/benji/workspace/all-the-trunks/zope.testrunner/src/zope/testrunner/testrunner-ex/sample2/sample23/sampletests_i.py", line 22, in Test
|
||
|
|
+ ...
|
||
|
|
raise TypeError('eek')
|
||
|
|
TypeError: eek
|
||
|
|
<BLANKLINE>
|
||
|
|
diff --git a/src/zope/testrunner/tests/testrunner-subunit.rst b/src/zope/testrunner/tests/testrunner-subunit.rst
|
||
|
|
index 9907f91..44d4488 100644
|
||
|
|
--- a/src/zope/testrunner/tests/testrunner-subunit.rst
|
||
|
|
+++ b/src/zope/testrunner/tests/testrunner-subunit.rst
|
||
|
|
@@ -495,7 +495,7 @@ Let's run tests including a module with some bad syntax:
|
||
|
|
Traceback (most recent call last):
|
||
|
|
File "/home/benji/workspace/all-the-trunks/zope.testrunner/src/zope/testrunner/testrunner-ex/sample2/sample23/sampletests_i.py", line 17, in <module>
|
||
|
|
class Test(unittest.TestCase):
|
||
|
|
- File "/home/benji/workspace/all-the-trunks/zope.testrunner/src/zope/testrunner/testrunner-ex/sample2/sample23/sampletests_i.py", line 22, in Test
|
||
|
|
+ ...
|
||
|
|
raise TypeError('eek')
|
||
|
|
TypeError: eek
|
||
|
|
]
|
||
|
|
|
||
|
|
From aa0c0c2fc8b1a103fe87a288b31a2d148e2c55a5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: dieter <dieter.maurer@online.de>
|
||
|
|
Date: Mon, 3 Jun 2024 11:06:25 +0200
|
||
|
|
Subject: [PATCH 2/2] optimize trailing whitespace re
|
||
|
|
|
||
|
|
---
|
||
|
|
src/zope/testrunner/tests/test_doctest.py | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/zope/testrunner/tests/test_doctest.py b/src/zope/testrunner/tests/test_doctest.py
|
||
|
|
index ef8d486..f73f924 100644
|
||
|
|
--- a/src/zope/testrunner/tests/test_doctest.py
|
||
|
|
+++ b/src/zope/testrunner/tests/test_doctest.py
|
||
|
|
@@ -88,7 +88,7 @@
|
||
|
|
# (re.compile('^> [^\n]+->None$', re.M), '> ...->None'),
|
||
|
|
|
||
|
|
# disregard trailing whitespace
|
||
|
|
- (re.compile(r'\s*$'), ''),
|
||
|
|
+ (re.compile(r'\s+$'), ''),
|
||
|
|
])
|
||
|
|
else:
|
||
|
|
# *nix
|
||
|
|
@@ -137,7 +137,7 @@
|
||
|
|
r''),
|
||
|
|
|
||
|
|
# disregard trailing whitespace
|
||
|
|
- (re.compile(r'\s*$', re.MULTILINE), ''),
|
||
|
|
+ (re.compile(r'\s+$', re.MULTILINE), ''),
|
||
|
|
])
|
||
|
|
|
||
|
|
|