diff options
Diffstat (limited to 'Lib/test')
| -rwxr-xr-x | Lib/test/regrtest.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_audioop.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_bz2.py | 11 | ||||
| -rw-r--r-- | Lib/test/test_fractions.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_multiprocessing.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_sys.py | 15 |
6 files changed, 25 insertions, 21 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index d523d5b..d47fde3 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -101,6 +101,8 @@ resources to test. Currently only the following are defined: curses - Tests that use curses and will modify the terminal's state and output modes. + lib2to3 - Run the tests for 2to3 (They take a while.) + largefile - It is okay to run some test that may create huge files. These tests can take a long time and may consume >2GB of disk space temporarily. @@ -173,8 +175,8 @@ if sys.platform == 'darwin': from test import support -RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'bsddb', - 'decimal', 'compiler', 'subprocess', 'urlfetch') +RESOURCE_NAMES = ('audio', 'curses', 'lib2to3', 'largefile', 'network', + 'bsddb', 'decimal', 'compiler', 'subprocess', 'urlfetch') def usage(msg): diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py index d43159a..689b0de 100644 --- a/Lib/test/test_audioop.py +++ b/Lib/test/test_audioop.py @@ -163,6 +163,10 @@ class TestAudioop(unittest.TestCase): self.assertEqual(audioop.getsample(data[1], 2, i), i) self.assertEqual(audioop.getsample(data[2], 4, i), i) + def test_negavitelen(self): + # from issue 3306, previously it segfaulted + self.assertRaises(audioop.error, + audioop.findmax, ''.join(chr(x) for x in range(256)), -2392392) def test_main(): run_unittest(TestAudioop) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index 4646f02..366ab7a 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -120,6 +120,17 @@ class BZ2FileTest(BaseTest): self.assertEqual(list(iter(bz2f)), sio.readlines()) bz2f.close() + def testClosedIteratorDeadlock(self): + # "Test that iteration on a closed bz2file releases the lock." + # http://bugs.python.org/issue3309 + self.createTempFile() + bz2f = BZ2File(self.filename) + bz2f.close() + self.assertRaises(ValueError, bz2f.__next__) + # This call will deadlock of the above .__next__ call failed to + # release the lock. + self.assertRaises(ValueError, bz2f.readlines) + def testWrite(self): # "Test BZ2File.write()" bz2f = BZ2File(self.filename, "w") diff --git a/Lib/test/test_fractions.py b/Lib/test/test_fractions.py index 3c8da77..4f8defb 100644 --- a/Lib/test/test_fractions.py +++ b/Lib/test/test_fractions.py @@ -62,11 +62,11 @@ class FractionTest(unittest.TestCase): self.assertRaisesMessage(ZeroDivisionError, "Fraction(12, 0)", F, 12, 0) - self.assertRaises(AttributeError, F, 1.5) - self.assertRaises(AttributeError, F, 1.5 + 3j) + self.assertRaises(TypeError, F, 1.5) + self.assertRaises(TypeError, F, 1.5 + 3j) - self.assertRaises(AttributeError, F, F(1, 2), 3) - self.assertRaises(AttributeError, F, "3/2", 3) + self.assertRaises(TypeError, F, F(1, 2), 3) + self.assertRaises(TypeError, F, "3/2", 3) def testFromString(self): self.assertEquals((5, 1), _components(F("5"))) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py index 4c5f7a5..5f5c588 100644 --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + # # Unit tests for the multiprocessing package # diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index cd8f565..f3c72e7 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -336,21 +336,6 @@ class SysModuleTest(unittest.TestCase): def test_clear_type_cache(self): sys._clear_type_cache() - def test_compact_freelists(self): - sys._compact_freelists() - r = sys._compact_freelists() - ## freed blocks shouldn't change - #self.assertEqual(r[0][2], 0) - ## fill freelists - #ints = list(range(10000)) - #floats = [float(i) for i in ints] - #del ints - #del floats - ## should free more than 100 blocks - #r = sys._compact_freelists() - #self.assert_(r[0][1] > 100, r[0][1]) - #self.assert_(r[0][2] > 100, r[0][2]) - def test_ioencoding(self): import subprocess,os env = dict(os.environ) |