From: Matthias Klose Date: Fri, 21 May 2010 13:08:20 +0000 (+0000) Subject: Merged revisions 80793 via svnmerge from X-Git-Tag: v2.6.6rc1~270 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a3b69ef0a8aa075bc0391f05b268095a77cda87;p=python Merged revisions 80793 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80793 | barry.warsaw | 2010-05-05 18:15:09 +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. ........ --- diff --git a/Lib/email/test/data/audiotest.au b/Lib/email/test/data/audiotest.au index 1ad28ce1fd..f76b0501b8 100644 Binary files a/Lib/email/test/data/audiotest.au and b/Lib/email/test/data/audiotest.au differ diff --git a/Lib/test/audiotest.au b/Lib/test/audiotest.au index 1ad28ce1fd..f76b0501b8 100644 Binary files a/Lib/test/audiotest.au and b/Lib/test/audiotest.au differ diff --git a/Lib/test/test_ossaudiodev.py b/Lib/test/test_ossaudiodev.py index 2a1eba7e53..8c45bb58ee 100644 --- a/Lib/test/test_ossaudiodev.py +++ b/Lib/test/test_ossaudiodev.py @@ -74,7 +74,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()