From 1c7061594c9fa38bba8d493e68d716758f3ad4b2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 27 Dec 2017 23:51:50 +0000 Subject: [PATCH] Add another failing reels test. --- test/data | 2 +- test/reels_test.cc | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/test/data b/test/data index b5e37d2b2..4f43d4d9b 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit b5e37d2b241a6397b7d53bef57b49d409adf236a +Subproject commit 4f43d4d9b436448681303e9fa51ae63a81e197e6 diff --git a/test/reels_test.cc b/test/reels_test.cc index ef1348116..db1d7e5c6 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -344,3 +344,27 @@ BOOST_AUTO_TEST_CASE (reels_test8) film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs ()); } + +/** Check another reels-wrleated error; make_dcp() would raise a ProgrammingError */ +BOOST_AUTO_TEST_CASE (reels_test9) +{ + shared_ptr film = new_test_film2("reels_test9a"); + shared_ptr A(new FFmpegContent(film, "test/data/flat_red.png")); + film->examine_and_add_content(A); + BOOST_REQUIRE(!wait_for_jobs()); + A->video->set_length(5 * 24); + film->make_dcp(); + BOOST_REQUIRE(!wait_for_jobs()); + + shared_ptr film2 = new_test_film2("reels_test9b"); + shared_ptr B(new DCPContent(film2, film->dir(film->dcp_name()))); + film2->examine_and_add_content(B); + film2->examine_and_add_content(content_factory(film, "test/data/dcp_sub4.xml").front()); + B->set_reference_video(true); + B->set_reference_audio(true); + BOOST_REQUIRE(!wait_for_jobs()); + film2->set_reel_type(REELTYPE_BY_VIDEO_CONTENT); + film2->write_metadata(); + film2->make_dcp(); + BOOST_REQUIRE(!wait_for_jobs()); +} -- 2.30.2