X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwriter_test.cc;h=1dfc75bfc024c588c7eef1b2db86cde3db64c4d2;hb=723779c27ffdafe27b3f23840eea4777ae838a83;hp=cb97cf78afb2209b4cccbf1dc342249e44bb5636;hpb=3b137ece1ab4bffe4c959047972c5d1317f8a79c;p=dcpomatic.git

diff --git a/test/writer_test.cc b/test/writer_test.cc
index cb97cf78a..1dfc75bfc 100644
--- a/test/writer_test.cc
+++ b/test/writer_test.cc
@@ -53,14 +53,16 @@ BOOST_AUTO_TEST_CASE (test_write_odd_amount_of_silence)
 
 BOOST_AUTO_TEST_CASE (interrupt_writer)
 {
-	auto film = new_test_film2 ("test_interrupt_writer");
+	Cleanup cl;
+
+	auto film = new_test_film2 ("test_interrupt_writer", {}, &cl);
 
 	auto content = content_factory("test/data/check_image0.png").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Add some dummy content to the film so that it has a reel of the right length */
-	auto constexpr frames = 24 * 60 * 60;
+	auto constexpr frames = 24 * 60;
 	content->video->set_length (frames);
 
 	/* Make a random J2K image */
@@ -93,7 +95,9 @@ BOOST_AUTO_TEST_CASE (interrupt_writer)
 	dcpomatic_sleep_seconds	(1);
 
 	thread.interrupt ();
+	thread.join ();
 
 	dcpomatic_sleep_seconds (1);
+	cl.run ();
 }