From 14beff81f0f4369a3323a84f49d53747a38bccfd Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 12:01:57 -0500 Subject: Port test_test to pytest --- setuptools/tests/test_test.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'setuptools/tests/test_test.py') diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py index 9a8f9313..f527aa24 100644 --- a/setuptools/tests/test_test.py +++ b/setuptools/tests/test_test.py @@ -7,7 +7,6 @@ import shutil import site import sys import tempfile -import unittest from setuptools.compat import StringIO, PY2 from setuptools.command.test import test @@ -51,9 +50,9 @@ TEST_PY = DALS(""" """) -class TestTestTest(unittest.TestCase): +class TestTestTest: - def setUp(self): + def setup_method(self, method): if sys.version < "2.6" or hasattr(sys, 'real_prefix'): return @@ -90,7 +89,7 @@ class TestTestTest(unittest.TestCase): self.old_site = site.USER_SITE site.USER_SITE = tempfile.mkdtemp() - def tearDown(self): + def teardown_method(self, method): if sys.version < "2.6" or hasattr(sys, 'real_prefix'): return -- cgit v1.2.1