diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-17 00:04:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-17 00:04:57 +0000 |
| commit | af2797a67f11e5cd06460f7ee582855feec3b5b5 (patch) | |
| tree | 07ed225375e76a0a506f43277f230640f2ac96e6 | |
| parent | 0c4f2d9aab93e66c8b027681d4f05e441dcb46b3 (diff) | |
Make import_dcp_test more fussy to expose a bug with importing encrypted DCPs without a KDM.
| -rw-r--r-- | test/import_dcp_test.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 403c1c992..137e6b125 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -50,10 +50,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 (); @@ -76,12 +76,13 @@ 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); + 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()); |