X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Frequired_disk_space_test.cc;h=6a177fd712b6d07d9685d6cc8692ed64ff2758a7;hp=bcb53bdaf71534acd3372f49e70d7c9020ca595f;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0

diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index bcb53bdaf..6a177fd71 100644
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -34,7 +34,7 @@ using boost::dynamic_pointer_cast;
 
 void check_within_n (int64_t a, int64_t b, int64_t n)
 {
-	BOOST_CHECK (abs (a - b) <= n);
+	BOOST_CHECK_MESSAGE (abs(a - b) <= n, "Estimated " << a << " differs from reference " << b << " by more than " << n);
 }
 
 
@@ -43,12 +43,13 @@ BOOST_AUTO_TEST_CASE (required_disk_space_test)
 	shared_ptr<Film> film = new_test_film ("required_disk_space_test");
 	film->set_j2k_bandwidth (100000000);
 	film->set_audio_channels (6);
-	shared_ptr<Content> content_a = content_factory(film, "test/data/flat_blue.png").front();
+	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	shared_ptr<Content> content_a = content_factory("test/data/flat_blue.png").front();
 	BOOST_REQUIRE (content_a);
 	film->examine_and_add_content (content_a);
-	shared_ptr<DCPContent> content_b (new DCPContent (film, "test/data/burnt_subtitle_test_dcp"));
+	shared_ptr<DCPContent> content_b (new DCPContent("test/data/burnt_subtitle_test_dcp"));
 	film->examine_and_add_content (content_b);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();
 
 	check_within_n (