summaryrefslogtreecommitdiff
path: root/test/ffmpeg_dcp_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-15 13:51:19 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-15 13:51:19 +0100
commitbbd20953701383dddc4c45d2ab317d55845d8b89 (patch)
tree24dd18fa75c8d9096e5763bd631bea6b5e78b950 /test/ffmpeg_dcp_test.cc
parentc73f2429ce94d29f06214143f1ecee96b7c62ae6 (diff)
Use wait_for_jobs more.
Diffstat (limited to 'test/ffmpeg_dcp_test.cc')
-rw-r--r--test/ffmpeg_dcp_test.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 06cb56e7d..946bccbb8 100644
--- 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 */