X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fmarkers_test.cc;h=844f25660a34d82d4c7aea3330632f90fa197ec1;hb=4f9314a311de379b105741273a15821da62a75cc;hp=1541348d17fe23554fc129c0065fa750d60c39db;hpb=66d80759298e4f27fb0de5d667be99a097feaee9;p=dcpomatic.git diff --git a/test/markers_test.cc b/test/markers_test.cc index 1541348d1..844f25660 100644 --- a/test/markers_test.cc +++ b/test/markers_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2020 Carl Hetherington + Copyright (C) 2020-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -49,8 +49,7 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1) BOOST_REQUIRE (!wait_for_jobs()); film->set_interop (false); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name())); dcp.read (); @@ -81,8 +80,12 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test2) film->set_interop (false); film->set_marker (dcp::Marker::FFOC, dcpomatic::DCPTime::from_seconds(1)); film->set_marker (dcp::Marker::LFOC, dcpomatic::DCPTime::from_seconds(9)); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp ( + film, + { + dcp::VerificationNote::Code::INCORRECT_FFOC, + dcp::VerificationNote::Code::INCORRECT_LFOC + }); dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name())); dcp.read ();