开源软件构建与测试

_service:extract_file:python-testtools.spec Changed

@@ -1,6 +1,6 @@
 Name:           python-testtools
 Version:        2.4.0
-Release:        3
+Release:        2
 Summary:        Extensions to the Python unit testing framework
 License:        MIT
 URL:            https://launchpad.net/testtools
@@ -10,8 +10,11 @@
 BuildRequires:  python3-traceback2 python3-testscenarios python3-sphinx python3-devel
 BuildArch:      noarch
 Patch0:         testtools-2.4.0-fix-py3-compat.patch
-Patch1:         testtools-2.4.0-fix_py39_test.patch
-Patch2:         Drop_traceback2_in_favor_of_traceback_and_remove_unused_linecache2.patch
+#Refer: https://github.com/testing-cabal/testtools/commit/254998e2e88835eaa634d9729dddcc3d4b5bc32f
+#Refer: https://github.com/testing-cabal/testtools/commit/1d698cf91cb2205aedc018e465a2e17c5a6a3e94
+Patch1:         fix-testresult-failed.patch
+#Refer: https://github.com/testing-cabal/testtools/commit/d528842b99b16efce212e15dae3f0a54927d06d8
+Patch2:         fix-testsuite-failed.patch
 
 %description
 Testtools is a set of extensions to the Python standard library's unit testing framework. These
@@ -58,11 +61,8 @@
 %doc doc/_build/html/*
 
 %changelog
-* Sun Apr 24 2022 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 2.4.0-3
-- Drop traceback2 in favor of traceback and remove unused linecache2
-
-* Sat Jan 08 2021 caodongxia <caodongxia@huawei.com> - 2.4.0-2
-- Fix test fail
+* Sat Apr 2 2022 caodongxia <caodongxia@huawei.com> - 2.4.0-2
+- Fix test_testresult and test_testsuite failed due to python3.10
 
 * Fri Aug 06 2021 liusheng <liusheng2048@gmail.com> - 2.4.0-1
 - Upgrade to version 2.4.0

_service:extract_file:Drop_traceback2_in_favor_of_traceback_and_remove_unused_linecache2.patch Deleted

@@ -1,47 +0,0 @@
-From b6cf7daa7e0598de1b627b566a146f5ff6863274 Mon Sep 17 00:00:00 2001
-From: Chih-Hsuan Yen <yan12125@gmail.com>
-Date: Mon, 24 Aug 2020 22:32:19 +0800
-Subject: PATCH Drop traceback2 in favor of traceback and remove unused
- linecache2
-
-diff --git a/requirements.txt b/requirements.txt
-index 1df0799d..a50bc02c 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -5,5 +5,4 @@
- # but someone kindly uploaded a fixed version as 'python-mimeparse'.
- python-mimeparse
- unittest2>=1.0.0
--traceback2
- six>=1.4.0
-diff --git a/testtools/compat.py b/testtools/compat.py
-index 8a86433f..b6e54816 100644
---- a/testtools/compat.py
-+++ b/testtools/compat.py
-@@ -30,8 +30,6 @@
- 
- BytesIO = try_imports('StringIO.StringIO', 'io.BytesIO')
- StringIO = try_imports('StringIO.StringIO', 'io.StringIO')
--# To let setup.py work, make this a conditional import.
--linecache = try_import('linecache2')
- 
- from testtools import _compat3x as _compat
- 
-
-diff --git a/testtools/content.py b/testtools/content.py
-index faad04dd..b84818a9 100644
---- a/testtools/content.py
-+++ b/testtools/content.py
-@@ -17,10 +17,9 @@
- import json
- import os
- import sys
-+import traceback
- 
- from extras import try_import
--# To let setup.py work, make this a conditional import.
--traceback = try_import('traceback2')
- 
- from testtools.compat import (
-     _b,
-

_service:extract_file:fix-testresult-failed.patch Added

@@ -0,0 +1,37 @@
+From 840f9230f9fc4433237517310b5b3958b7382f09 Mon Sep 17 00:00:00 2001
+From: caodongxia <315816521@qq.com>
+Date: Sat, 2 Apr 2022 11:00:19 +0800
+Subject: PATCH fix for python3.10
+Refer: https://github.com/testing-cabal/testtools/commit/254998e2e88835eaa634d9729dddcc3d4b5bc32f
+Refer: https://github.com/testing-cabal/testtools/commit/1d698cf91cb2205aedc018e465a2e17c5a6a3e94
+
+---
+ testtools/tests/test_testresult.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py
+index d863794..e06ea03 100644
+--- a/testtools/tests/test_testresult.py
++++ b/testtools/tests/test_testresult.py
+@@ -2681,6 +2681,8 @@ class TestNonAsciiResults(TestCase):
+         """Syntax errors should still have fancy special-case formatting"""
+         if platform.python_implementation() == "PyPy":
+             spaces = '           '
++        elif sys.version_info >= (3, 10):
++            spaces = '        '
+         else:
+             spaces = '          '
+         textoutput = self._test_external_case("exec ('f(a, b c)')")
+@@ -2755,6 +2757,9 @@ class TestNonAsciiResults(TestCase):
+         textoutput = self._setup_external_case("import bad")
+         self._write_module("bad", "utf-8", _u("\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(
+-- 
+2.27.0
+

_service:extract_file:fix-testsuite-failed.patch Added

@@ -0,0 +1,45 @@
+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(events36.decode('utf8'), DocTestMatches("""\
+-TypeError: run() takes ...1 ...argument...2...given...
++TypeError: ...run() takes ...1 ...argument...2...given...
+ """, doctest.ELLIPSIS))
+         events = event0:10 + (None,) for event in events
+         events1 = events1:6 + (None,) + events17:
+         
+         
\ No newline at end of file

_service:extract_file:testtools-2.4.0-fix_py39_test.patch Deleted

_service Changed

_service:tar_scm:python-testtools-1650770150.f780d95.tar Deleted

_service:tar_scm:python-testtools-1655205688.35ec6b1.tar Added

Changes of Revision 4