up to 3.10.8

[packages/python3.git] / python3-no_cmdline_tests.patch

diff --git a/python3-no_cmdline_tests.patch b/python3-no_cmdline_tests.patch
index badfcb4f9dab504d0a847fc8ec38418fe227e0eb..e78668798ebe770e85128a92049572f0e2481c02 100644 (file)
--- a/python3-no_cmdline_tests.patch
+++ b/python3-no_cmdline_tests.patch
@@ -1,31 +1,18 @@
-diff -dur -x '*~' Lib/test.orig//regrtest.py Lib/test//regrtest.py
---- Lib/test.orig//regrtest.py 2011-07-09 08:58:49.000000000 +0200
-+++ Lib/test//regrtest.py      2011-07-15 14:38:55.000000000 +0200
-@@ -216,7 +216,7 @@
- 
- from test import support
- 
--RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network',
-+RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'cmdline',
-                   'decimal', 'cpu', 'subprocess', 'urlfetch', 'gui')
- 
- TEMPDIR = os.path.abspath(tempfile.gettempdir())
-diff -dur -x '*~' Lib/test.orig//test_compileall.py Lib/test//test_compileall.py
---- Lib/test.orig//test_compileall.py  2011-07-09 08:58:50.000000000 +0200
-+++ Lib/test//test_compileall.py       2011-07-15 14:41:08.000000000 +0200
-@@ -130,7 +130,7 @@
-         finally:
+diff -urNp -x '*.orig' Python-3.9.2.org/Lib/test/test_compileall.py Python-3.9.2/Lib/test/test_compileall.py
+--- Python-3.9.2.org/Lib/test/test_compileall.py       2021-02-19 13:31:44.000000000 +0100
++++ Python-3.9.2/Lib/test/test_compileall.py   2021-02-25 18:40:29.876560976 +0100
+@@ -419,6 +419,7 @@ class EncodingTest(unittest.TestCase):
              sys.stdout = orig_stdout
  
--
+ 
 +@unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled")
- class CommandLineTests(unittest.TestCase):
+ class CommandLineTestsBase:
      """Test compileall's CLI."""
  
-diff -dur -x '*~' Lib/test.orig//test_warnings.py Lib/test//test_warnings.py
---- Lib/test.orig//test_warnings.py    2011-07-09 08:58:51.000000000 +0200
-+++ Lib/test//test_warnings.py 2011-07-15 14:44:11.000000000 +0200
-@@ -715,6 +715,7 @@
+diff -urNp -x '*.orig' Python-3.9.2.org/Lib/test/test_warnings/__init__.py Python-3.9.2/Lib/test/test_warnings/__init__.py
+--- Python-3.9.2.org/Lib/test/test_warnings/__init__.py        2021-02-19 13:31:44.000000000 +0100
++++ Python-3.9.2/Lib/test/test_warnings/__init__.py    2021-02-25 18:40:29.876560976 +0100
+@@ -1126,6 +1126,7 @@ class PyCatchWarningTests(CatchWarningTe
      module = py_warnings
  
  
@@ -33,16 +20,16 @@ diff -dur -x '*~' Lib/test.orig//test_warnings.py Lib/test//test_warnings.py
  class EnvironmentVariableTests(BaseTest):
  
      def test_single_warning(self):
-@@ -760,14 +761,17 @@
-                 "['ignore:DeprecaciónWarning']".encode('utf-8'))
-         self.assertEqual(p.wait(), 0)
+@@ -1206,14 +1207,17 @@ class EnvironmentVariableTests(BaseTest)
+             PYTHONDEVMODE="")
+         self.assertEqual(stdout, str([PYTHONWARNINGS]).encode())
  
 +@unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled")
- class CEnvironmentVariableTests(EnvironmentVariableTests):
+ class CEnvironmentVariableTests(EnvironmentVariableTests, unittest.TestCase):
      module = c_warnings
  
 +@unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled")
- class PyEnvironmentVariableTests(EnvironmentVariableTests):
+ class PyEnvironmentVariableTests(EnvironmentVariableTests, unittest.TestCase):
      module = py_warnings