diff options
| author | John Szakmeister <john@szakmeister.net> | 2016-02-02 15:54:28 -0500 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2016-02-02 15:54:28 -0500 |
| commit | 1dd4921d900828952d60a0a79068450615c63047 (patch) | |
| tree | 97b921dce4337903ad8a6eb39cb8ab860cd83622 | |
| parent | 6e11bf997b137fdfdd1b5acb537b5d85dee2013c (diff) | |
| parent | 916fc672bd88a7e96738bc6bc5ac977666704030 (diff) | |
| download | nose-1dd4921d900828952d60a0a79068450615c63047.tar.gz | |
Merge pull request #983 from mitya57/master
Make tests work with Python ≥ 3.5
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | functional_tests/test_load_tests_from_test_case.py | 1 | ||||
| -rw-r--r-- | nose/util.py | 1 | ||||
| -rw-r--r-- | unit_tests/test_xunit.py | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index d051e5e..ec90ef8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ python: - 3.2 - 3.3 - 3.4 + - 3.5 - pypy install: - pip uninstall -y nose diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py index 42f8563..13d0c8a 100644 --- a/functional_tests/test_load_tests_from_test_case.py +++ b/functional_tests/test_load_tests_from_test_case.py @@ -29,6 +29,7 @@ class NoFixturePlug(Plugin): pass def tearDown(self): pass + Derived.__qualname__ = Derived.__name__ # must use nose loader here because the default loader in 2.3 # won't load tests from base classes l = loader.TestLoader() diff --git a/nose/util.py b/nose/util.py index bfe1658..80ab1d4 100644 --- a/nose/util.py +++ b/nose/util.py @@ -643,6 +643,7 @@ def transplant_class(cls, module): pass C.__module__ = module C.__name__ = cls.__name__ + C.__qualname__ = cls.__name__ return C diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py index 944d285..261436b 100644 --- a/unit_tests/test_xunit.py +++ b/unit_tests/test_xunit.py @@ -16,6 +16,7 @@ def mktest(): class TC(unittest.TestCase): def runTest(self): pass + TC.__qualname__ = TC.__name__ test = TC() return test |