diff options
| author | Michael Merickel <michael@merickel.org> | 2020-05-06 22:40:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 22:40:38 -0500 |
| commit | 33eefaeb4542546fe5febd6e22a35418f59fbdde (patch) | |
| tree | d6ff27fe811bf7f3d63822f1cba2601ef36c8d20 /tests | |
| parent | f43f5f61c2113f0ed0e7d104d823d6b3ac174a51 (diff) | |
| parent | 57687face8ec3a912d6d886b8b2bcf27a97c82d0 (diff) | |
| download | pyramid-33eefaeb4542546fe5febd6e22a35418f59fbdde.tar.gz pyramid-33eefaeb4542546fe5febd6e22a35418f59fbdde.tar.bz2 pyramid-33eefaeb4542546fe5febd6e22a35418f59fbdde.zip | |
Merge pull request #3578 from Pylons/switch-to-pytest
Switch to pytest
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_path.py | 4 | ||||
| -rw-r--r-- | tests/test_util.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/test_path.py b/tests/test_path.py index 384460fb1..c9cfde2b6 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 unittest + import _pytest result = self._callFUT(3) - self.assertEqual(result, unittest) + self.assertEqual(result, _pytest) def test_it_package(self): import tests diff --git a/tests/test_util.py b/tests/test_util.py index 93493c683..f79cdeb85 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -492,8 +492,7 @@ class Test_object_description(unittest.TestCase): def test_method(self): self.assertEqual( self._callFUT(self.test_method), - 'method test_method of class tests.test_util.' - 'Test_object_description', + 'function tests.test_util.test_method', ) def test_class(self): |