Merge.

[dcpomatic.git] / test / scaling_test.cc

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index dba611043793d1c53713929bd008133ec35346bd..fd700fbb9a0f4310830b70b3d0a4f61f968ea9ca 100644 (file)
--- 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);