More cleanups.

2 files changed, 10 insertions, 10 deletions

diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc
index d9e2c7c00..45ba264cd 100644
--- a/test/no_use_video_test.cc
+++ b/test/no_use_video_test.cc
@@ -72,13 +72,11 @@ BOOST_AUTO_TEST_CASE (no_use_video_test1)
 /** Overlay two muxed sources and disable the video on one */
 BOOST_AUTO_TEST_CASE (no_use_video_test2)
 {
-	auto film = new_test_film2 ("no_use_video_test2");
+	Cleanup cl;
+
 	auto A = content_factory(TestPaths::private_data() / "dolby_aurora.vob")[0];
 	auto B = content_factory(TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov")[0];
-	film->examine_and_add_content (A);
-	film->examine_and_add_content (B);
-	BOOST_REQUIRE (!wait_for_jobs());
-
+	auto film = new_test_film2("no_use_video_test2", { A, B }, &cl);
 	A->set_position (film, dcpomatic::DCPTime());
 	B->set_position (film, dcpomatic::DCPTime());
 	A->video->set_use (false);
@@ -88,6 +86,8 @@ BOOST_AUTO_TEST_CASE (no_use_video_test2)
 	make_and_verify_dcp (film);
 
 	check_dcp (TestPaths::private_data() / "no_use_video_test2", film);
+
+	cl.run();
 }
 
 
diff --git a/test/player_test.cc b/test/player_test.cc
index 5c6ef2617..c91458129 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -389,14 +389,14 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
 /** Test a crash when the gap between the last audio and the start of a silent period is more than 1 sample */
 BOOST_AUTO_TEST_CASE (player_silence_crash)
 {
-	auto film = new_test_film2 ("player_silence_crash");
-	auto sine = content_factory("test/data/impulse_train.wav")[0];
-	film->examine_and_add_content (sine);
-	BOOST_REQUIRE (!wait_for_jobs());
+	Cleanup cl;
 
+	auto sine = content_factory("test/data/impulse_train.wav")[0];
+	auto film = new_test_film2("player_silence_crash", { sine }, &cl);
 	sine->set_video_frame_rate(film, 23.976);
-	film->write_metadata ();
 	make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA});
+
+	cl.run();
 }