diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-15 13:51:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-15 13:51:19 +0100 |
| commit | bbd20953701383dddc4c45d2ab317d55845d8b89 (patch) | |
| tree | 24dd18fa75c8d9096e5763bd631bea6b5e78b950 /test/scaling_test.cc | |
| parent | c73f2429ce94d29f06214143f1ecee96b7c62ae6 (diff) | |
Use wait_for_jobs more.
Diffstat (limited to 'test/scaling_test.cc')
| -rw-r--r-- | test/scaling_test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/scaling_test.cc b/test/scaling_test.cc index ab64928ce..fd700fbb9 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -31,9 +31,7 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> co film->set_container (Ratio::from_id (container)); film->make_dcp (); - while (JobManager::instance()->work_to_do ()) {} - - BOOST_CHECK (!JobManager::instance()->errors()); + wait_for_jobs (); boost::filesystem::path ref; ref = "test"; @@ -57,7 +55,8 @@ BOOST_AUTO_TEST_CASE (scaling_test) shared_ptr<ImageMagickContent> imc (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png")); film->examine_and_add_content (imc); - while (JobManager::instance()->work_to_do ()) {} + + wait_for_jobs (); imc->set_video_length (1); |
