mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Make PyPIRCCommandTestCase derive from a base class

Browse source 
Several test cases in distutils use PyPIRCCommandTestCase as
their base class and as a result of that the following tests
were ran more than once:

* test_server_registration
* test_server_empty_registration
* test_config_interpolation

This commit moves the infrastructure used by other tests
into a new BasePyPIRCCommandTestCase class.
This commit is contained in:
Berker Peksag 2016-06-24 08:48:27 +03:00
parent 9e941d6373
commit 91d53e7b20
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/distutils/tests/test_config.py
View file

@ -52,14 +52,14 @@ password:xxx
""" """
class PyPIRCCommandTestCase(support.TempdirManager, class BasePyPIRCCommandTestCase(support.TempdirManager,
support.LoggingSilencer, support.LoggingSilencer,
support.EnvironGuard, support.EnvironGuard,
unittest.TestCase): unittest.TestCase):
def setUp(self): def setUp(self):
"""Patches the environment.""" """Patches the environment."""
super(PyPIRCCommandTestCase, self).setUp() super(BasePyPIRCCommandTestCase, self).setUp()
self.tmp_dir = self.mkdtemp() self.tmp_dir = self.mkdtemp()
os.environ['HOME'] = self.tmp_dir os.environ['HOME'] = self.tmp_dir
self.rc = os.path.join(self.tmp_dir, '.pypirc') self.rc = os.path.join(self.tmp_dir, '.pypirc')
@ -78,7 +78,10 @@ class PyPIRCCommandTestCase(support.TempdirManager,
def tearDown(self): def tearDown(self):
"""Removes the patch.""" """Removes the patch."""
set_threshold(self.old_threshold) set_threshold(self.old_threshold)
super(PyPIRCCommandTestCase, self).tearDown() super(BasePyPIRCCommandTestCase, self).tearDown()
class PyPIRCCommandTestCase(BasePyPIRCCommandTestCase):
def test_server_registration(self): def test_server_registration(self):
# This test makes sure PyPIRCCommand knows how to: # This test makes sure PyPIRCCommand knows how to:

4
Lib/distutils/tests/test_register.py
View file

@ -12,7 +12,7 @@ from distutils.command.register import register
from distutils.errors import DistutilsSetupError from distutils.errors import DistutilsSetupError
from distutils.log import INFO from distutils.log import INFO
from distutils.tests.test_config import PyPIRCCommandTestCase from distutils.tests.test_config import BasePyPIRCCommandTestCase
try: try:
import docutils import docutils
@ -72,7 +72,7 @@ class FakeOpener(object):
}.get(name.lower(), default) }.get(name.lower(), default)
class RegisterTestCase(PyPIRCCommandTestCase): class RegisterTestCase(BasePyPIRCCommandTestCase):
def setUp(self): def setUp(self):
super(RegisterTestCase, self).setUp() super(RegisterTestCase, self).setUp()

4
Lib/distutils/tests/test_sdist.py
View file

@ -23,7 +23,7 @@ except ImportError:
from distutils.command.sdist import sdist, show_formats from distutils.command.sdist import sdist, show_formats
from distutils.core import Distribution from distutils.core import Distribution
from distutils.tests.test_config import PyPIRCCommandTestCase from distutils.tests.test_config import BasePyPIRCCommandTestCase
from distutils.errors import DistutilsOptionError from distutils.errors import DistutilsOptionError
from distutils.spawn import find_executable from distutils.spawn import find_executable
from distutils.log import WARN from distutils.log import WARN
@ -52,7 +52,7 @@ somecode%(sep)sdoc.dat
somecode%(sep)sdoc.txt somecode%(sep)sdoc.txt
""" """
class SDistTestCase(PyPIRCCommandTestCase): class SDistTestCase(BasePyPIRCCommandTestCase):
def setUp(self): def setUp(self):
# PyPIRCCommandTestCase creates a temp dir already # PyPIRCCommandTestCase creates a temp dir already

4
Lib/distutils/tests/test_upload.py
View file

@ -12,7 +12,7 @@ from distutils.core import Distribution
from distutils.errors import DistutilsError from distutils.errors import DistutilsError
from distutils.log import ERROR, INFO from distutils.log import ERROR, INFO
from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase from distutils.tests.test_config import PYPIRC, BasePyPIRCCommandTestCase
PYPIRC_LONG_PASSWORD = """\ PYPIRC_LONG_PASSWORD = """\
[distutils] [distutils]
@ -66,7 +66,7 @@ class FakeOpen(object):
return self.code return self.code
class uploadTestCase(PyPIRCCommandTestCase): class uploadTestCase(BasePyPIRCCommandTestCase):
def setUp(self): def setUp(self):
super(uploadTestCase, self).setUp() super(uploadTestCase, self).setUp()