X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=1f5247392a461b6dd90033b4189a7a18c2f02b7c;hb=be2e60789c5b4ed99d68625b5f793092afa2cbf4;hp=403c1c992320edf01e635f5d6457048f79748ea3;hpb=1029bec7334fedbd8570cd8bfa5ddf954da8b3ec;p=dcpomatic.git

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 403c1c992..1f5247392 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -30,6 +30,8 @@
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/examine_content_job.h"
+#include "lib/job_manager.h"
 #include "lib/config.h"
 #include "lib/cross.h"
 #include <dcp/cpl.h>
@@ -50,10 +52,10 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 	shared_ptr<FFmpegContent> c (new FFmpegContent (A, "test/data/test.mp4"));
 	A->examine_and_add_content (c);
 	A->set_encrypted (true);
-	wait_for_jobs ();
+	BOOST_CHECK (!wait_for_jobs ());
 
 	A->make_dcp ();
-	wait_for_jobs ();
+	BOOST_CHECK (!wait_for_jobs ());
 
 	dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name());
 	A_dcp.read ();
@@ -66,7 +68,8 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 		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::MODIFIED_TRANSITIONAL_1
+		dcp::MODIFIED_TRANSITIONAL_1,
+		true, 0
 		);
 
 	shared_ptr<Film> B = new_test_film ("import_dcp_test2");
@@ -76,12 +79,14 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 	B->set_interop (false);
 
 	shared_ptr<DCPContent> d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name()));
-	d->add_kdm (kdm);
 	B->examine_and_add_content (d);
-	wait_for_jobs ();
+	BOOST_CHECK (!wait_for_jobs ());
+	d->add_kdm (kdm);
+	JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (B, d)));
+	BOOST_CHECK (!wait_for_jobs ());
 
 	B->make_dcp ();
-	wait_for_jobs ();
+	BOOST_CHECK (!wait_for_jobs ());
 
 	/* Should be 1s red, 1s green, 1s blue */
 	check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name());