diff options
| -rw-r--r-- | test/test_conversion.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/test/test_conversion.py b/test/test_conversion.py index 8359b94..ff5a8bb 100644 --- a/test/test_conversion.py +++ b/test/test_conversion.py @@ -22,7 +22,7 @@ class FakeConverterInfo(converter.ConverterInfo): def get_arguments(self, video, output): return ['-u', os.path.join( - os.path.dirname(__file__), 'testdata', 'fake_converter.py'), + os.path.dirname(__file__), 'testdata', 'fake_converter.py'), video.filename, output] def process_status_line(self, video, line): @@ -48,7 +48,7 @@ class ConversionManagerTest(base.Test): 'duration': conversion.duration, 'progress': conversion.progress, 'eta': conversion.eta - }) + }) def spin(self, timeout): finish_by = time.time() + timeout @@ -88,19 +88,19 @@ class ConversionManagerTest(base.Test): self.assertTrue(os.path.exists(c.output)) self.assertEqual(file(c.output).read(), 'blank') self.assertEqual(self.changes, [ - {'status': 'converting', 'duration': 5.0, 'eta': 5.0, - 'progress': 0.0}, - {'status': 'converting', 'duration': 5.0, 'eta': 4.0, - 'progress': 1.0}, - {'status': 'converting', 'duration': 5.0, 'eta': 3.0, - 'progress': 2.0}, - {'status': 'converting', 'duration': 5.0, 'eta': 2.0, - 'progress': 3.0}, - {'status': 'converting', 'duration': 5.0, 'eta': 1.0, - 'progress': 4.0}, - {'status': 'finished', 'duration': 5.0, 'eta': 0.0, - 'progress': 5.0} - ]) + {'status': 'converting', 'duration': 5.0, 'eta': 5.0, + 'progress': 0.0}, + {'status': 'converting', 'duration': 5.0, 'eta': 4.0, + 'progress': 1.0}, + {'status': 'converting', 'duration': 5.0, 'eta': 3.0, + 'progress': 2.0}, + {'status': 'converting', 'duration': 5.0, 'eta': 2.0, + 'progress': 3.0}, + {'status': 'converting', 'duration': 5.0, 'eta': 1.0, + 'progress': 4.0}, + {'status': 'finished', 'duration': 5.0, 'eta': 0.0, + 'progress': 5.0} + ]) def test_conversion_with_error(self): filename = os.path.join(self.temp_dir, 'error.webm') @@ -133,7 +133,7 @@ class ConversionManagerTest(base.Test): c = self.manager.start_conversion(vf, self.converter) c2 = self.manager.start_conversion(vf2, self.converter) self.assertEqual(len(self.manager.in_progress), 2) - self.spin(3) # if they're linear, it should take < 5s + self.spin(3) # if they're linear, it should take < 5s self.assertEqual(c.status, 'finished') self.assertEqual(c2.status, 'finished') @@ -156,16 +156,16 @@ class ConversionManagerTest(base.Test): def test_unicode_characters(self): for filename in ( - u'"TAKE2\'s" REHEARSAL човен поўны вуграмі', - u'ところで早け', - u'Lputefartøavål'): + u'"TAKE2\'s" REHEARSAL човен поўны вуграмі', + u'ところで早け', + u'Lputefartøavål'): full_filename = os.path.join(self.temp_dir, filename) shutil.copyfile(os.path.join(self.testdata_dir, 'webm-0.webm'), full_filename) c = self.start_conversion(full_filename) self.assertEqual(c.status, 'finished') self.assertTrue(filename in c.output, '%r not in %r' % ( - filename, c.output)) + filename, c.output)) def test_overwrite(self): filename = os.path.join(self.temp_dir, 'webm-0.webm') |