diff options
Diffstat (limited to 'test/test_conversion.py')
| -rw-r--r-- | test/test_conversion.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/test_conversion.py b/test/test_conversion.py index ff5a8bb..eb933b4 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 @@ -133,7 +133,8 @@ 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 + # if they're linear, it should take < 5s + self.spin(3) self.assertEqual(c.status, 'finished') self.assertEqual(c2.status, 'finished') |