mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 21:30:08 +02:00
988d5a67e6
Due to changes in setuptools, we need to run 2to3 ourselves. While we're at it, lets apply relevant patches from Debian. https://salsa.debian.org/python-team/packages/nose/
66 lines
3.1 KiB
Diff
66 lines
3.1 KiB
Diff
From: Dmitry Shachnev <mitya57@gmail.com>
|
|
Date: Mon, 30 Oct 2017 23:40:34 +0300
|
|
Subject: Fix failures with Python 3.6 related to the new ModuleNotFoundError
|
|
class
|
|
|
|
---
|
|
functional_tests/test_loader.py | 2 +-
|
|
functional_tests/test_withid_failures.rst | 12 ++++++------
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/functional_tests/test_loader.py b/functional_tests/test_loader.py
|
|
index 81aaa7b..3f82122 100644
|
|
--- a/functional_tests/test_loader.py
|
|
+++ b/functional_tests/test_loader.py
|
|
@@ -369,7 +369,7 @@ class TestNoseTestLoader(unittest.TestCase):
|
|
assert res.errors, "Expected errors but got none"
|
|
assert not res.failures, res.failures
|
|
err = res.errors[0][0].test.exc_class
|
|
- assert err is ImportError, \
|
|
+ assert issubclass(err, ImportError), \
|
|
"Expected import error, got %s" % err
|
|
|
|
def test_load_nonsense_name(self):
|
|
diff --git a/functional_tests/test_withid_failures.rst b/functional_tests/test_withid_failures.rst
|
|
index cf09d4f..1362c90 100644
|
|
--- a/functional_tests/test_withid_failures.rst
|
|
+++ b/functional_tests/test_withid_failures.rst
|
|
@@ -7,16 +7,16 @@
|
|
>>> support = os.path.join(os.path.dirname(__file__), 'support', 'id_fails')
|
|
>>> argv = [__file__, '-v', '--with-id', '--id-file', idfile, support]
|
|
>>> run(argv=argv, plugins=[TestId()]) # doctest: +ELLIPSIS
|
|
- #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
|
|
+ #1 Failure: ...Error (No module ...apackagethatdoesntexist...) ... ERROR
|
|
#2 test_b.test ... ok
|
|
#3 test_b.test_fail ... FAIL
|
|
<BLANKLINE>
|
|
======================================================================
|
|
- ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
|
|
+ ERROR: Failure: ...Error (No module ...apackagethatdoesntexist...)
|
|
----------------------------------------------------------------------
|
|
Traceback (most recent call last):
|
|
...
|
|
- ImportError: No module ...apackagethatdoesntexist...
|
|
+ ...Error: No module ...apackagethatdoesntexist...
|
|
<BLANKLINE>
|
|
======================================================================
|
|
FAIL: test_b.test_fail
|
|
@@ -35,14 +35,14 @@ Addressing failures works (sometimes).
|
|
>>> argv.append('1')
|
|
>>> _junk = sys.modules.pop('test_a', None) # 2.3 requires
|
|
>>> run(argv=argv, plugins=[TestId()]) #doctest: +ELLIPSIS
|
|
- #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
|
|
+ #1 Failure: ...Error (No module ...apackagethatdoesntexist...) ... ERROR
|
|
<BLANKLINE>
|
|
======================================================================
|
|
- ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
|
|
+ ERROR: Failure: ...Error (No module ...apackagethatdoesntexist...)
|
|
----------------------------------------------------------------------
|
|
Traceback (most recent call last):
|
|
...
|
|
- ImportError: No module ...apackagethatdoesntexist...
|
|
+ ...Error: No module ...apackagethatdoesntexist...
|
|
<BLANKLINE>
|
|
----------------------------------------------------------------------
|
|
Ran 1 test in ...s
|