X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=python3-no_cmdline_tests.patch;h=ad85bff49e5789faa4711290058b8038d913a543;hb=edb753bc170e4f5473adf35ca8c21dd67a692a8f;hp=badfcb4f9dab504d0a847fc8ec38418fe227e0eb;hpb=cd7dc7662e1b838e1e6f134f03fd7af427032bd7;p=packages%2Fpython3.git

diff --git a/python3-no_cmdline_tests.patch b/python3-no_cmdline_tests.patch
index badfcb4..ad85bff 100644
--- a/python3-no_cmdline_tests.patch
+++ b/python3-no_cmdline_tests.patch
@@ -1,18 +1,6 @@
-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
+diff -Nur Python-3.3.1.orig/Lib/test/test_compileall.py Python-3.3.1/Lib/test/test_compileall.py
+--- Python-3.3.1.orig/Lib/test/test_compileall.py	2013-04-06 08:41:41.000000000 +0100
++++ Python-3.3.1/Lib/test/test_compileall.py	2013-04-07 19:39:23.449157629 +0100
 @@ -130,7 +130,7 @@
          finally:
              sys.stdout = orig_stdout
@@ -22,10 +10,10 @@ diff -dur -x '*~' Lib/test.orig//test_compileall.py Lib/test//test_compileall.py
  class CommandLineTests(unittest.TestCase):
      """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 -Nur Python-3.3.1.orig/Lib/test/test_warnings/__init__.py Python-3.3.1/Lib/test/test_warnings/__init__.py
+--- Python-3.3.1.orig/Lib/test/test_warnings/__init__.py	2013-04-06 08:41:46.000000000 +0100
++++ Python-3.3.1/Lib/test/test_warnings/__init__.py	2013-04-07 19:41:25.529164545 +0100
+@@ -717,6 +717,7 @@
      module = py_warnings
  
  
@@ -33,16 +21,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 @@
+@@ -762,14 +763,17 @@
                  "['ignore:DeprecaciónWarning']".encode('utf-8'))
          self.assertEqual(p.wait(), 0)
  
 +@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