summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-12-27 23:51:50 +0000
committerCarl Hetherington <cth@carlh.net>2017-12-27 23:51:50 +0000
commit1c7061594c9fa38bba8d493e68d716758f3ad4b2 (patch)
tree9b0c77d6996f3648e8a6009eca5440a4801d9f7b /test
parentdaa7b1e5647ddb3478b6515b1506ea97ea8ee0e5 (diff)
Add another failing reels test.
Diffstat (limited to 'test')
m---------test/data0
-rw-r--r--test/reels_test.cc24
2 files changed, 24 insertions, 0 deletions
diff --git a/test/data b/test/data
-Subproject b5e37d2b241a6397b7d53bef57b49d409adf236
+Subproject 4f43d4d9b436448681303e9fa51ae63a81e197e
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> film = new_test_film2("reels_test9a");
+ shared_ptr<FFmpegContent> 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<Film> film2 = new_test_film2("reels_test9b");
+ shared_ptr<DCPContent> 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());
+}