[Python-checkins] r81395 - in python/branches/release26-maint: Lib/email/test/data/audiotest.au Lib/test/audiotest.au Lib/test/test_ossaudiodev.py

[matthias.klose]

Author: matthias.klose
Date: Fri May 21 15:08:20 2010
New Revision: 81395

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/email/test/data/audiotest.au
   python/branches/release26-maint/Lib/test/audiotest.au
   python/branches/release26-maint/Lib/test/test_ossaudiodev.py

Modified: python/branches/release26-maint/Lib/email/test/data/audiotest.au
==============================================================================
Binary files. No diff available.

Modified: python/branches/release26-maint/Lib/test/audiotest.au
==============================================================================
Binary files. No diff available.

Modified: python/branches/release26-maint/Lib/test/test_ossaudiodev.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_ossaudiodev.py	(original)
+++ python/branches/release26-maint/Lib/test/test_ossaudiodev.py	Fri May 21 15:08:20 2010
@@ -74,7 +74,7 @@
 
         # 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()