python-nose/repos/extra-any/python-nose-py36.patch

   1 From acf7c4e073030a69712172b133076101e2b7d81f Mon Sep 17 00:00:00 2001
   2 From: Tomas Orsava <torsava@redhat.com>
   3 Date: Mon, 12 Dec 2016 12:09:47 +0100
   4 Subject: [PATCH] Patch for compatibility with Python 3.6
   5
   6 Python 3.6 returns a ModuleNotFoundError instead of the previous ImportError.
   7 ---
   8  functional_tests/test_loader.py           |  2 +-
   9  functional_tests/test_withid_failures.rst | 12 ++++++------
  10  2 files changed, 7 insertions(+), 7 deletions(-)
  11
  12 diff --git a/functional_tests/test_loader.py b/functional_tests/test_loader.py
  13 index 81aaa7b..3f82122 100644
  14 --- a/functional_tests/test_loader.py
  15 +++ b/functional_tests/test_loader.py
  16 @@ -369,7 +369,7 @@ class TestNoseTestLoader(unittest.TestCase):
  17          assert res.errors, "Expected errors but got none"
  18          assert not res.failures, res.failures
  19          err = res.errors[0][0].test.exc_class
  20 -        assert err is ImportError, \
  21 +        assert issubclass(err, ImportError), \
  22              "Expected import error, got %s" % err
  23
  24      def test_load_nonsense_name(self):
  25 diff --git a/functional_tests/test_withid_failures.rst b/functional_tests/test_withid_failures.rst
  26 index cf09d4f..cb20886 100644
  27 --- a/functional_tests/test_withid_failures.rst
  28 +++ b/functional_tests/test_withid_failures.rst
  29 @@ -7,16 +7,16 @@
  30      >>> support = os.path.join(os.path.dirname(__file__), 'support', 'id_fails')
  31      >>> argv = [__file__, '-v', '--with-id', '--id-file', idfile, support]
  32      >>> run(argv=argv, plugins=[TestId()]) # doctest: +ELLIPSIS
  33 -    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
  34 +    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
  35      #2 test_b.test ... ok
  36      #3 test_b.test_fail ... FAIL
  37      <BLANKLINE>
  38      ======================================================================
  39 -    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
  40 +    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
  41      ----------------------------------------------------------------------
  42      Traceback (most recent call last):
  43      ...
  44 -    ImportError: No module ...apackagethatdoesntexist...
  45 +    ...: No module ...apackagethatdoesntexist...
  46      <BLANKLINE>
  47      ======================================================================
  48      FAIL: test_b.test_fail
  49 @@ -35,14 +35,14 @@ Addressing failures works (sometimes).
  50      >>> argv.append('1')
  51      >>> _junk = sys.modules.pop('test_a', None) # 2.3 requires
  52      >>> run(argv=argv, plugins=[TestId()]) #doctest: +ELLIPSIS
  53 -    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
  54 +    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
  55      <BLANKLINE>
  56      ======================================================================
  57 -    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
  58 +    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
  59      ----------------------------------------------------------------------
  60      Traceback (most recent call last):
  61      ...
  62 -    ImportError: No module ...apackagethatdoesntexist...
  63 +    ...: No module ...apackagethatdoesntexist...
  64      <BLANKLINE>
  65      ----------------------------------------------------------------------
  66      Ran 1 test in ...s
  67 --
  68 2.11.0
  69