From 54bb8ec390c86f333ed4fb6e383b348035253f14 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Jan 2019 10:58:04 +0000 Subject: [PATCH] Make sure that ffmpeg_dcp_test always completes. --- test/ffmpeg_dcp_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc index 4b2388bcd..d5a766d6a 100644 --- a/test/ffmpeg_dcp_test.cc +++ b/test/ffmpeg_dcp_test.cc @@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) shared_ptr c (new FFmpegContent("test/data/test.mp4")); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); c->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); @@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) film->make_dcp (); film->write_metadata (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); } /** Briefly test Film::cpls(). Requires the output from ffmpeg_dcp_test above */ -- 2.30.2