diff options
| author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-03-27 12:55:19 +0000 |
|---|---|---|
| committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-03-27 12:55:19 +0000 |
| commit | 3236138cf67412d8fd673b4adb6cf17fe123f7fd (patch) | |
| tree | c5f4157098b928ce61d3dea8f18b0e3633ec99a9 /Lib/unittest | |
| parent | 12ffe1715848ba123de0e58f06040f8897527199 (diff) | |
| download | cpython-3236138cf67412d8fd673b4adb6cf17fe123f7fd.tar.gz | |
A fix for running unittest tests on platforms without the audioop module (e.g. jython and IronPython)
Diffstat (limited to 'Lib/unittest')
| -rw-r--r-- | Lib/unittest/test/dummy.py | 1 | ||||
| -rw-r--r-- | Lib/unittest/test/test_loader.py | 20 |
2 files changed, 7 insertions, 14 deletions
diff --git a/Lib/unittest/test/dummy.py b/Lib/unittest/test/dummy.py new file mode 100644 index 0000000000..e4f14e4035 --- /dev/null +++ b/Lib/unittest/test/dummy.py @@ -0,0 +1 @@ +# Empty module for testing the loading of modules diff --git a/Lib/unittest/test/test_loader.py b/Lib/unittest/test/test_loader.py index 7a3a59dc0a..032423ab46 100644 --- a/Lib/unittest/test/test_loader.py +++ b/Lib/unittest/test/test_loader.py @@ -524,12 +524,8 @@ class Test_TestLoader(unittest.TestCase): # We're going to try to load this module as a side-effect, so it # better not be loaded before we try. # - # Why pick audioop? Google shows it isn't used very often, so there's - # a good chance that it won't be imported when this test is run - module_name = 'audioop' - - if module_name in sys.modules: - del sys.modules[module_name] + module_name = 'unittest.test.dummy' + sys.modules.pop(module_name, None) loader = unittest.TestLoader() try: @@ -538,7 +534,7 @@ class Test_TestLoader(unittest.TestCase): self.assertIsInstance(suite, loader.suiteClass) self.assertEqual(list(suite), []) - # audioop should now be loaded, thanks to loadTestsFromName() + # module should now be loaded, thanks to loadTestsFromName() self.assertIn(module_name, sys.modules) finally: if module_name in sys.modules: @@ -911,12 +907,8 @@ class Test_TestLoader(unittest.TestCase): # We're going to try to load this module as a side-effect, so it # better not be loaded before we try. # - # Why pick audioop? Google shows it isn't used very often, so there's - # a good chance that it won't be imported when this test is run - module_name = 'audioop' - - if module_name in sys.modules: - del sys.modules[module_name] + module_name = 'unittest.test.dummy' + sys.modules.pop(module_name, None) loader = unittest.TestLoader() try: @@ -925,7 +917,7 @@ class Test_TestLoader(unittest.TestCase): self.assertIsInstance(suite, loader.suiteClass) self.assertEqual(list(suite), [unittest.TestSuite()]) - # audioop should now be loaded, thanks to loadTestsFromName() + # module should now be loaded, thanks to loadTestsFromName() self.assertIn(module_name, sys.modules) finally: if module_name in sys.modules: |