X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Finterrupt_encoder_test.cc;h=ed988a65b44b15fdfedd2164267dcdb7da916cde;hb=f0a2a52ddd1118236d4ce5640339c24bae88aa12;hp=4d5787997f40912441ecc6a633cbeb0aa42bafdb;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc
index 4d5787997..ed988a65b 100644
--- a/test/interrupt_encoder_test.cc
+++ b/test/interrupt_encoder_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/interrupt_encoder_test.cc
+ *  @brief Test clean shutdown of threads if a DCP encode is interrupted.
+ *  @ingroup specific
+ */
+
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
@@ -27,10 +32,8 @@
 #include "lib/cross.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 
 using boost::shared_ptr;
-using boost::make_shared;
 
 /** Interrupt a DCP encode when it is in progress, as this used to (still does?)
  *  sometimes give an error related to pthreads.
@@ -42,13 +45,13 @@ BOOST_AUTO_TEST_CASE (interrupt_encoder_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("interrupt_encoder_test");
 
-	shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, private_data / "prophet_clip.mkv");
+	shared_ptr<FFmpegContent> content (new FFmpegContent(private_data / "prophet_long_clip.mkv"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->make_dcp ();
 
-	dcpomatic_sleep (10);
+	dcpomatic_sleep_seconds (10);
 
 	JobManager::drop ();
 }