X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=3f6f41b55af551a9a4c044282b59bb0b7e50fb37;hb=bf662cb786ba243cc3479d471c8d2ad7c06d28d4;hp=b2420b1fe490c585ff0741f8f677bf1492aebf1e;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2;p=dcpomatic.git diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index b2420b1fe..3f6f41b55 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) A->set_name ("frobozz"); shared_ptr c (new FFmpegContent (A, "test/data/test.mp4")); - A->examine_and_add_content (c, true); + A->examine_and_add_content (c); A->set_encrypted (true); wait_for_jobs (); @@ -64,11 +64,12 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) shared_ptr d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name())); d->add_kdm (kdm); - B->examine_and_add_content (d, true); + B->examine_and_add_content (d); wait_for_jobs (); B->make_dcp (); wait_for_jobs (); - check_dcp ("build/test/import_dcp_test2/" + B->dcp_name(), "test/data/import_dcp_test2"); + /* Should be 1s red, 1s green, 1s blue */ + check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name()); }