From: Matthias Klose Date: Fri, 21 May 2010 13:11:00 +0000 (+0000) Subject: Merged revisions 80795 via svnmerge from X-Git-Tag: v3.1.3rc1~729 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06f018d54d939625c9d47525c8dc42755df11ce5;p=python 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. ........ --- 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 055ad6c167..5dea640d89 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() diff --git a/Misc/NEWS b/Misc/NEWS index f52ec6d381..de634e5eba 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -83,6 +83,8 @@ Library - Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills. Patch by Tres Seaver. +- Issue #7755: Use an unencumbered audio file for tests. + - Issue #8621: uuid.uuid4() returned the same sequence of values in the parent and any children created using ``os.fork`` on MacOS X 10.6.