From 7df920303c8995f8b54b7d2ae74aef1e4923d462 Mon Sep 17 00:00:00 2001 From: Hugo Date: Wed, 13 Dec 2017 15:53:15 +0200 Subject: [PATCH] Remove nose-specific code --- Tests/helper.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Tests/helper.py b/Tests/helper.py index 66f8e9d9d..fdeb00c0c 100644 --- a/Tests/helper.py +++ b/Tests/helper.py @@ -63,10 +63,8 @@ class PillowTestCase(unittest.TestCase): def delete_tempfile(self, path): try: ok = self.currentResult.wasSuccessful() - except AttributeError: # for nosetests - # proxy = self.currentResult - # ok = (len(proxy.errors) + len(proxy.failures) == 0) - ok = True # TODO pytest + except AttributeError: # for pytest + ok = True if ok: # only clean out tempfiles if test passed @@ -211,10 +209,6 @@ class PillowTestCase(unittest.TestCase): if skip: self.skipTest(msg or "Known Bad Test") - def shortDescription(self): - # Prevents `nose -v` printing docstrings - return None - def tempfile(self, template): assert template[:5] in ("temp.", "temp_") fd, path = tempfile.mkstemp(template[4:], template[:4])