diff options
| -rw-r--r-- | src/distutils2/tests/test_dist.py | 25 | ||||
| -rw-r--r-- | src/distutils2/tests/test_emxccompiler.py | 1 | ||||
| -rwxr-xr-x | src/distutils2/tests/test_extension.py | 1 | ||||
| -rw-r--r-- | src/distutils2/tests/test_register.py | 1 | ||||
| -rw-r--r-- | src/distutils2/tests/test_sdist.py | 1 |
5 files changed, 7 insertions, 22 deletions
diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py index e280869..5858ad5 100644 --- a/src/distutils2/tests/test_dist.py +++ b/src/distutils2/tests/test_dist.py @@ -4,7 +4,6 @@ import os import StringIO import sys -import warnings import textwrap from distutils2.dist import Distribution, fix_help_options, DistributionMetadata @@ -172,23 +171,13 @@ class DistributionTestCase(support.TempdirManager, # list of attributes cls = Distribution - # catching warnings - warns = [] - def _warn(msg): - warns.append(msg) - - old_warn = warnings.warn - warnings.warn = _warn - try: - dist = cls(attrs={'author': 'xxx', - 'name': 'xxx', - 'version': 'xxx', - 'url': 'xxxx', - 'options': {}}) - finally: - warnings.warn = old_warn + dist = cls(attrs={'author': 'xxx', + 'name': 'xxx', + 'version': 'xxx', + 'url': 'xxxx', + 'options': {}}) - self.assertEqual(len(warns), 0) + self.assertEqual(len(self.warnings), 0) def test_non_empty_options(self): # TODO: how to actually use options is not documented except @@ -314,7 +303,7 @@ class DistributionTestCase(support.TempdirManager, ('post', cmd)]) class MetadataTestCase(support.TempdirManager, support.EnvironGuard, - unittest.TestCase): + support.LoggingSilencer, unittest.TestCase): def setUp(self): super(MetadataTestCase, self).setUp() diff --git a/src/distutils2/tests/test_emxccompiler.py b/src/distutils2/tests/test_emxccompiler.py index 117e005..5b042dc 100644 --- a/src/distutils2/tests/test_emxccompiler.py +++ b/src/distutils2/tests/test_emxccompiler.py @@ -1,7 +1,6 @@ """Tests for distutils.emxccompiler.""" import sys import os -import warnings from distutils2.tests import run_unittest from distutils2.tests import captured_stdout diff --git a/src/distutils2/tests/test_extension.py b/src/distutils2/tests/test_extension.py index ac19c6a..d98ce43 100755 --- a/src/distutils2/tests/test_extension.py +++ b/src/distutils2/tests/test_extension.py @@ -1,6 +1,5 @@ """Tests for distutils.extension.""" import os -import warnings from distutils2.extension import Extension from distutils2.tests.support import unittest diff --git a/src/distutils2/tests/test_register.py b/src/distutils2/tests/test_register.py index 5081f49..bd4b732 100644 --- a/src/distutils2/tests/test_register.py +++ b/src/distutils2/tests/test_register.py @@ -4,7 +4,6 @@ import sys import os import getpass import urllib2 -import warnings try: import docutils diff --git a/src/distutils2/tests/test_sdist.py b/src/distutils2/tests/test_sdist.py index c974175..68ee33b 100644 --- a/src/distutils2/tests/test_sdist.py +++ b/src/distutils2/tests/test_sdist.py @@ -20,7 +20,6 @@ except ImportError: from os.path import join import sys -import warnings from distutils2.tests import captured_stdout |