Fix deadlock in test.

[dcpomatic.git] / test / file_naming_test.cc

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index f06fdfa42fa211f6fa2f85353e56cecce9b44153..6b5b2020d77aba32120dee7e7264ba15526758b3 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -65,11 +65,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
        film->examine_and_add_content (g);
        shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
        film->examine_and_add_content (b);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        int got[3] = { 0, 0, 0 };
        for (
@@ -104,11 +104,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        film->examine_and_add_content (g);
        shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
        film->examine_and_add_content (b);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        int got[3] = { 0, 0, 0 };
        for (