Use wait_for_jobs more.

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 60b215ffb87dae21bde24e8592771b35ad50ecdc..51ce605f82589b0bf70559e0106e59ded658484f 100644 (file)
--- a/test/black_fill_test.cc
+++ b/test/black_fill_test.cc
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE (black_fill_test)
 
        film->examine_and_add_content (contentA);
        film->examine_and_add_content (contentB);
-       while (JobManager::instance()->work_to_do ()) {}
+       wait_for_jobs ();
 
        contentA->set_video_length (3);
        contentA->set_start (film->video_frames_to_time (2));

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 06cb56e7dd490436841b8f89abcfb8045f1c9778..946bccbb8c96652db136487e7605c60c46831215 100644 (file)
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -29,23 +29,14 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
        c->set_ratio (Ratio::from_id ("185"));
        film->examine_and_add_content (c);
 
-       /* Wait for the examine to finish */
-       while (JobManager::instance()->work_to_do ()) {
-               dcpomatic_sleep (1);
-       }
-
-       BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
+       wait_for_jobs ();
        
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        film->make_dcp ();
        film->write_metadata ();
 
-       while (JobManager::instance()->work_to_do ()) {
-               dcpomatic_sleep (1);
-       }
-       
-       BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
+       wait_for_jobs ();
 }
 
 /** Test Film::have_dcp().  Requires the output from ffmpeg_dcp_test above */

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index ab64928ce8a656e0dfb7befbacf3eedb5522678a..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);