X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvf_kdm_test.cc;h=f37742c038aacdc20272f67d04c20ce0701b0813;hb=20c70c93a38551842721ddee2e08c7b33a7bb924;hp=9b48f9b28633a6876b5f32e213047956868d9136;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index 9b48f9b28..f37742c03 100644
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -53,9 +53,9 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
 	A->examine_and_add_content (c);
 	A->set_encrypted (true);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	A->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	dcp::DCP A_dcp ("build/test/vf_kdm_test_ov/" + A->dcp_name());
 	A_dcp.read ();
@@ -66,8 +66,8 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 		Config::instance()->decryption_chain()->leaf (),
 		vector<string>(),
 		A_dcp.cpls().front()->file().get(),
-		dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
-		dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
+		dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
+		dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
 		dcp::MODIFIED_TRANSITIONAL_1,
 		true, 0
 		);
@@ -85,9 +85,9 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	d->set_reference_video (true);
 	B->examine_and_add_content (d);
 	B->set_encrypted (true);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	B->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	dcp::DCP B_dcp ("build/test/vf_kdm_test_vf/" + B->dcp_name());
 	B_dcp.read ();
@@ -96,8 +96,8 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 		Config::instance()->decryption_chain()->leaf (),
 		vector<string>(),
 		B_dcp.cpls().front()->file().get(),
-		dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
-		dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
+		dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
+		dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
 		dcp::MODIFIED_TRANSITIONAL_1,
 		true, 0
 		);
@@ -116,9 +116,9 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	e->add_kdm (B_kdm);
 	e->add_ov ("build/test/vf_kdm_test_ov/" + A->dcp_name());
 	C->examine_and_add_content (e);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	C->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Should be 1s red, 1s green, 1s blue */
 	check_dcp ("test/data/vf_kdm_test_check", "build/test/vf_kdm_test_check/" + C->dcp_name());