diff options
author | Matthias Klose <doko@ubuntu.com> | 2010-05-21 13:11:00 (GMT) |
---|---|---|
committer | Matthias Klose <doko@ubuntu.com> | 2010-05-21 13:11:00 (GMT) |
commit | 06f018d54d939625c9d47525c8dc42755df11ce5 (patch) | |
tree | 7b596928eb92225696f4096f44d9f4251178cd0a /Lib | |
parent | 8e2e16e95e1132cdde9a64bcfc1d27120079c749 (diff) | |
download | cpython-06f018d54d939625c9d47525c8dc42755df11ce5.zip cpython-06f018d54d939625c9d47525c8dc42755df11ce5.tar.gz cpython-06f018d54d939625c9d47525c8dc42755df11ce5.tar.bz2 |
Merged revisions 80795 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r80795 | barry.warsaw | 2010-05-05 18:18:31 +0200 (Mi, 05 Mai 2010) | 5 lines
Bug 7755: audiotest.au is arguably copyrighted material, but definitely makes
Debian unhappy. The actual contents of the audio clip are unimportant, so
replace it with something that we know is okay. Guido likes woodpeckers.
........
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/email/test/data/audiotest.au | bin | 23493 -> 28144 bytes | |||
-rw-r--r-- | Lib/test/audiotest.au | bin | 23493 -> 28144 bytes | |||
-rw-r--r-- | Lib/test/test_ossaudiodev.py | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/Lib/email/test/data/audiotest.au b/Lib/email/test/data/audiotest.au Binary files differindex 1ad28ce..f76b050 100644 --- a/Lib/email/test/data/audiotest.au +++ b/Lib/email/test/data/audiotest.au diff --git a/Lib/test/audiotest.au b/Lib/test/audiotest.au Binary files differindex 1ad28ce..f76b050 100644 --- a/Lib/test/audiotest.au +++ b/Lib/test/audiotest.au diff --git a/Lib/test/test_ossaudiodev.py b/Lib/test/test_ossaudiodev.py index 055ad6c..5dea640 100644 --- a/Lib/test/test_ossaudiodev.py +++ b/Lib/test/test_ossaudiodev.py @@ -76,7 +76,7 @@ class OSSAudioDevTests(unittest.TestCase): # set parameters based on .au file headers dsp.setparameters(AFMT_S16_NE, nchannels, rate) - self.assertTrue(abs(expected_time - 2.94) < 1e-2, expected_time) + self.assertTrue(abs(expected_time - 3.51) < 1e-2, expected_time) t1 = time.time() dsp.write(data) dsp.close() |