From: Barry Warsaw <barry@python.org>
Date: Wed, 5 May 2010 16:18:31 +0000 (+0000)
Subject: Bug 7755: audiotest.au is arguably copyrighted material, but definitely makes
X-Git-Tag: v3.2a1~924
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83d8998390bebc1f1d5aa9f5d8a68f7994bede58;p=thirdparty%2FPython%2Fcpython.git

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 1ad28ce1fdd7..f76b0501b8c6 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 1ad28ce1fdd7..f76b0501b8c6 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 055ad6c167c6..5dea640d8923 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 b25f110c17c3..f3d27e10bad4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -348,6 +348,8 @@ C-API
 Library
 -------
 
+- 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.