gnu/packages/patches/python-3-fix-tests.patch

   1 Additional test fixes which affect Python 3.5 (and presumably later) but not
   2 prior revisions of Python.
   3
   4 --- Lib/test/test_pathlib.py     2014-03-01 03:02:36.088311000 +0100
   5 +++ Lib/test/test_pathlib.py     2014-03-01 04:56:37.768311000 +0100
   6 @@ -2132,8 +2132,7 @@
   7          self.assertEqual(given, expect)
   8          self.assertEqual(set(p.rglob("FILEd*")), set())
   9
  10 -    @unittest.skipUnless(hasattr(pwd, 'getpwall'),
  11 -                         'pwd module does not expose getpwall()')
  12 +    @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests")
  13      def test_expanduser(self):
  14          P = self.cls
  15          support.import_module('pwd')
  16 --- Lib/test/test_tarfile.py        2016-02-24 19:22:52.597208055 +0000
  17 +++ Lib/test/test_tarfile.py     2016-02-24 20:50:48.941950135 +0000
  18 @@ -2305,11 +2305,14 @@
  19      try:
  20          import pwd, grp
  21      except ImportError:
  22          return False
  23 -    if pwd.getpwuid(0)[0] != 'root':
  24 -        return False
  25 -    if grp.getgrgid(0)[0] != 'root':
  26 +    try:
  27 +        if pwd.getpwuid(0)[0] != 'root':
  28 +            return False
  29 +        if grp.getgrgid(0)[0] != 'root':
  30 +            return False
  31 +    except KeyError:
  32          return False
  33      return True
  34
  35
  36 --- Lib/test/test_asyncio/test_base_events.py
  37 +++ Lib/test/test_asyncio/test_base_events.py
  38 @@ -1216,6 +1216,8 @@
  39          self._test_create_connection_ip_addr(m_socket, False)
  40
  41      @patch_socket
  42 +    @unittest.skipUnless(support.is_resource_enabled('network'),
  43 +                         'network is not enabled')
  44      def test_create_connection_service_name(self, m_socket):
  45          m_socket.getaddrinfo = socket.getaddrinfo
  46          sock = m_socket.socket.return_value
  47
  48 --- Lib/test/test_pdb.py.org    2017-03-12 03:09:01.991856701 +0100
  49 +++ Lib/test/test_pdb.py        2017-03-12 03:26:17.742572869 +0100
  50
  51 For some reason, KeyboardInterrupts do not work in the build
  52 environment (lack of controlling TTY?). Just change the expected
  53 outcome. Unfortunately, this will make it fail for users running
  54 `python -m test test_pdb test_pdb` interactively.
  55
  56 @@ -928,11 +928,11 @@
  57      > <doctest test.test_pdb.test_pdb_issue_20766[0]>(6)test_function()
  58      -> print('pdb %d: %s' % (i, sess._previous_sigint_handler))
  59      (Pdb) continue
  60 -    pdb 1: <built-in function default_int_handler>
  61 +    pdb 1: Handlers.SIG_IGN
  62      > <doctest test.test_pdb.test_pdb_issue_20766[0]>(5)test_function()
  63      -> sess.set_trace(sys._getframe())
  64      (Pdb) continue
  65 -    pdb 2: <built-in function default_int_handler>
  66 +    pdb 2: Handlers.SIG_IGN
  67      """
  68
  69  class PdbTestCase(unittest.TestCase):
  70 --- Lib/test/test_socket.py
  71 +++ Lib/test/test_socket.py
  72 @@ -802,6 +802,8 @@
  73          if not fqhn in all_host_names:
  74              self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names)))
  75
  76 +    @unittest.skipUnless(support.is_resource_enabled('network'),
  77 +                         'network is not enabled')
  78      def test_host_resolution(self):
  79          for addr in [support.HOST, '10.0.0.1', '255.255.255.255']:
  80              self.assertEqual(socket.gethostbyname(addr), addr)
  81 --- Lib/test/test_spwd.py
  82 +++ Lib/test/test_spwd.py
  83 @@ -5,8 +5,7 @@
  84  spwd = support.import_module('spwd')
  85
  86
  87 -@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() == 0,
  88 -                     'root privileges required')
  89 +@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow')
  90  class TestSpwdRoot(unittest.TestCase):
  91
  92      def test_getspall(self):
  93 @@ -56,8 +55,7 @@
  94              self.assertRaises(TypeError, spwd.getspnam, bytes_name)
  95
  96
  97 -@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() != 0,
  98 -                     'non-root user required')
  99 +@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow')
 100  class TestSpwdNonRoot(unittest.TestCase):
 101
 102      def test_getspnam_exception(self):
 103 --- Lib/test/test_regrtest.py
 104 +++ Lib/test/test_regrtest.py
 105 @@ -700,6 +700,7 @@
 106          output = self.run_tests('--fromfile', filename)
 107          self.check_executed_tests(output, tests)
 108
 109 +    @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.')
 110      def test_interrupted(self):
 111          code = TEST_INTERRUPTED
 112          test = self.create_test('sigint', code=code)
 113 @@ -717,6 +718,7 @@
 114                   % (self.TESTNAME_REGEX, len(tests)))
 115          self.check_line(output, regex)
 116
 117 +    @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.')
 118      def test_slow_interrupted(self):
 119          # Issue #25373: test --slowest with an interrupted test
 120          code = TEST_INTERRUPTED
 121 --- Lib/test/test_generators.py
 122 +++ Lib/test/test_generators.py
 123 @@ -29,6 +29,7 @@
 124          else:
 125              return "FAILED"
 126
 127 +    @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment')
 128      def test_raise_and_yield_from(self):
 129          gen = self.generator1()
 130          gen.send(None)
 131 --- Lib/test/test_normalization.py
 132 +++ Lib/test/test_normalization.py
 133 @@ -2,6 +2,7 @@
 134  import unittest
 135
 136  from http.client import HTTPException
 137 +from urllib.error import URLError
 138  import sys
 139  from unicodedata import normalize, unidata_version
 140
 141 @@ -43,6 +44,8 @@
 142          except PermissionError:
 143              self.skipTest(f"Permission error when downloading {TESTDATAURL} "
 144                            f"into the test data directory")
 145 +        except URLError:
 146 +            self.skipTest("DNS lookups are not enabled.")
 147          except (OSError, HTTPException):
 148              self.fail(f"Could not retrieve {TESTDATAURL}")
 149