diff options
| author | Bert JW Regeer <xistence@0x58.com> | 2020-05-28 16:58:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 16:58:54 -0700 |
| commit | 412fadefabdddda7481fba1bc86958d2f3d10631 (patch) | |
| tree | 7c0c549662d393d3657679b502f524dacd1cda79 /tests | |
| parent | 683bc742f7b08db563f3385796809c09babf004b (diff) | |
| parent | b19492dbbe5cebbabb91f01ae312d951b39ee931 (diff) | |
| download | pyramid-412fadefabdddda7481fba1bc86958d2f3d10631.tar.gz pyramid-412fadefabdddda7481fba1bc86958d2f3d10631.tar.bz2 pyramid-412fadefabdddda7481fba1bc86958d2f3d10631.zip | |
Merge pull request #3588 from Pylons/fix/pytest_runner
Fix: pytest runner
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_path.py | 4 | ||||
| -rw-r--r-- | tests/test_util.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_path.py b/tests/test_path.py index c9cfde2b6..384460fb1 100644 --- a/tests/test_path.py +++ b/tests/test_path.py @@ -101,10 +101,10 @@ class TestCallerPackage(unittest.TestCase): self.assertEqual(result, tests) def test_it_level_3(self): - import _pytest + import unittest result = self._callFUT(3) - self.assertEqual(result, _pytest) + self.assertEqual(result, unittest) def test_it_package(self): import tests diff --git a/tests/test_util.py b/tests/test_util.py index 8ed082ee4..0fb975f66 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -492,7 +492,8 @@ class Test_object_description(unittest.TestCase): def test_method(self): self.assertEqual( self._callFUT(self.test_method), - 'function tests.test_util.test_method', + 'method test_method of class tests.test_util.' + 'Test_object_description', ) def test_class(self): |