tests/testencoding.py: use total_frames, not duration, remove trailing spaces

diff --git a/tests/testencoding.py b/tests/testencoding.py
index 07f976a5e7398ed741bfb43b2933f943d522e286..1dcabd44afb95df841afd0a8df5490aac9b066de 100644 (file)
--- a/tests/testencoding.py
+++ b/tests/testencoding.py
@@ -15,7 +15,7 @@ class TestEncoding(TestCase):
         import tempfile
         self.tmpfile = tempfile.NamedTemporaryFile(delete=True)
         self.sink = self.tmpfile.name
-   
+
     def testWav(self):
         "Test wav encoding"
         from timeside.encoder.wav import WavEncoder
@@ -28,22 +28,22 @@ class TestEncoding(TestCase):
 
     def testMp3(self):
         "Test mp3 encoding"
-        from timeside.encoder.mp3 import Mp3Encoder 
+        from timeside.encoder.mp3 import Mp3Encoder
         self.encoder = Mp3Encoder(self.sink)
 
     def testAac(self):
         "Test aac encoding"
-        from timeside.encoder.m4a import AacEncoder 
+        from timeside.encoder.m4a import AacEncoder
         self.encoder = AacEncoder(self.sink)
 
     def testFlac(self):
         "Test flac encoding"
-        from timeside.encoder.flac import FlacEncoder 
+        from timeside.encoder.flac import FlacEncoder
         self.encoder = FlacEncoder(self.sink)
 
     def testWebm(self):
         "Test webm encoding"
-        from timeside.encoder.webm import WebMEncoder 
+        from timeside.encoder.webm import WebMEncoder
         self.encoder = WebMEncoder(self.sink)
 
     def tearDown(self):
@@ -51,13 +51,13 @@ class TestEncoding(TestCase):
         self.encoder.setup(channels = self.channels, samplerate = self.samplerate)
 
         written_frames, eod = 0, False
-        duration = 3. * self.samplerate
+        total_frames = 3. * self.samplerate
         block_size = 1024
         f0 = 800.
         omega = 2. * pi * f0 / float(self.samplerate)
 
         while True:
-            remaining = duration - written_frames 
+            remaining = total_frames - written_frames
             if remaining >= block_size:
               write_length = block_size
             else:
@@ -69,10 +69,10 @@ class TestEncoding(TestCase):
             self.encoder.process(frames, eod)
             written_frames += frames.shape[0]
             if eod:
-                break
-            if self.encoder.eod :
+                self.assertEquals(self.encoder.eod, eod)
                 break
 
+        self.assertEquals(written_frames, total_frames)
         self.tmpfile.close()
 
 if __name__ == '__main__':