From: Walter Dörwald <walter@livinglogic.de>
Date: Tue, 3 Apr 2007 16:08:10 +0000 (+0000)
Subject: Move the functionality for catching warnings in test_warnings.py into a separate
X-Git-Tag: v2.6a1~1880
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d815d357b28a019faa515a56fd927b15cdb580cf;p=thirdparty%2FPython%2Fcpython.git

Move the functionality for catching warnings in test_warnings.py into a separate
class to that reusing the functionality in test_structmembers.py doesn't rerun
the tests from test_warnings.py.
---

diff --git a/Lib/test/test_structmembers.py b/Lib/test/test_structmembers.py
index 93dd2acaf406..5dc21759b88c 100644
--- a/Lib/test/test_structmembers.py
+++ b/Lib/test/test_structmembers.py
@@ -39,7 +39,7 @@ class ReadWriteTests(unittest.TestCase):
         ts.T_ULONG=ULONG_MAX
         self.assertEquals(ts.T_ULONG, ULONG_MAX)
 
-class TestWarnings(test.test_warnings.TestModule):
+class TestWarnings(test.test_warnings.CatchWarningTest):
     def has_warned(self):
         self.assertEqual(test.test_warnings.msg.category,
                          exceptions.RuntimeWarning.__name__)
diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index a7ccb6b292d2..0ad83edb19bf 100644
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -20,7 +20,7 @@ def showwarning(message, category, filename, lineno, file=None):
     msg.filename = os.path.basename(filename)
     msg.lineno = lineno
 
-class TestModule(unittest.TestCase):
+class CatchWarningTest(unittest.TestCase):
 
     def setUp(self):
         global msg
@@ -35,6 +35,8 @@ class TestModule(unittest.TestCase):
         warnings.filters = self._filters[:]
         warnings.showwarning = self._showwarning
 
+class TestModule(CatchWarningTest):
+
     def test_warn_default_category(self):
         for i in range(4):
             text = 'multi %d' %i    # Different text on each call