Fix tests after changes to config parameters.

3 files changed, 11 insertions, 0 deletions

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 4bfb446d7..3b9afe2d8 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -67,6 +67,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 	auto content = content_factory("test/data/subrip2.srt")[0];
 	auto film = new_test_film("burnt_subtitle_test_subrip", { content });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
+	film->set_audio_channels(8);
 	content->text[0]->set_use(true);
 	content->text[0]->set_burn(true);
 	make_and_verify_dcp(
@@ -90,6 +91,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 	auto film = new_test_film("burnt_subtitle_test_dcp", { content });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film->set_name("frobozz");
+	film->set_audio_channels(8);
 	content->text[0]->set_use(true);
 	make_and_verify_dcp(
 		film,
@@ -115,6 +117,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 	auto film2 = new_test_film("burnt_subtitle_test_onto_dcp2", { background_dcp, sub });
 	film2->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film2->set_name("frobozz");
+	film2->set_audio_channels(8);
 	sub->text[0]->set_burn(true);
 	sub->text[0]->set_effect(dcp::Effect::BORDER);
 	make_and_verify_dcp (film2);
@@ -156,6 +159,7 @@ BOOST_AUTO_TEST_CASE(burnt_subtitle_test_position)
 		auto const name = fmt::format("burnt_subtitle_test_position_{}", alignment);
 		auto subs = content_factory(fmt::format("test/data/burn_{}.xml", alignment));
 		auto film = new_test_film(name, subs);
+		film->set_audio_channels(8);
 		subs[0]->text[0]->set_use(true);
 		subs[0]->text[0]->set_burn(true);
 		make_and_verify_dcp(
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 051832b2f..0e7715525 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -544,6 +544,7 @@ BOOST_AUTO_TEST_CASE(test_ffmpeg_encoder_with_clipping_dcp_audio)
 	string const name = "test_ffmpeg_encoder_with_clipping_dcp_audio";
 	auto content = content_factory("test/data/sine_16_48_440_10.wav");
 	auto film = new_test_film(name + "_in", content);
+	film->set_audio_channels(8);
 	content[0]->audio->set_gain(0.5);
 
 	make_and_verify_dcp(
diff --git a/test/hints_test.cc b/test/hints_test.cc
index eaa034066..55bd9d77f 100644
--- a/test/hints_test.cc
+++ b/test/hints_test.cc
@@ -77,6 +77,7 @@ check (TextType type, string name, optional<string> expected_hint = optional<str
 	content->text.front()->set_type (type);
 	content->text.front()->set_language (dcp::LanguageTag("en-US"));
 	film->examine_and_add_content({content});
+	film->set_audio_channels(8);
 	BOOST_REQUIRE (!wait_for_jobs());
 	auto hints = get_hints (film);
 
@@ -184,6 +185,7 @@ BOOST_AUTO_TEST_CASE (hint_subtitle_mxf_too_big)
 	string const name = "hint_subtitle_mxf_too_big";
 
 	auto film = new_test_film(name);
+	film->set_audio_channels(8);
 
 	for (int i = 0; i < 4; ++i) {
 		dcp::File fake_font("build/test/hint_subtitle_mxf_too_big.ttf", "w");
@@ -219,6 +221,7 @@ BOOST_AUTO_TEST_CASE (hint_closed_caption_xml_too_big)
 	string const name = "hint_closed_caption_xml_too_big";
 
 	auto film = new_test_film(name);
+	film->set_audio_channels(8);
 
 	dcp::File ccap(fmt::format("build/test/{}.srt", name), "w");
 	BOOST_REQUIRE (ccap);
@@ -266,6 +269,7 @@ BOOST_AUTO_TEST_CASE (hints_audio_with_no_language)
 {
 	auto content = content_factory("test/data/sine_440.wav")[0];
 	auto film = new_test_film("hints_audio_with_no_language", { content });
+	film->set_audio_channels(8);
 	content->audio->set_gain (-6);
 
 	auto hints = get_hints (film);
@@ -285,6 +289,7 @@ BOOST_AUTO_TEST_CASE (hints_certificate_validity)
 	Config::instance()->set_signer_chain(make_shared<dcp::CertificateChain>(openssl_path(), 40 * 365));
 
 	auto film = new_test_film("hints_certificate_validity");
+	film->set_audio_channels(8);
 	auto hints = get_hints (film);
 	BOOST_REQUIRE_EQUAL (hints.size(), 1U);
 	BOOST_CHECK_EQUAL (
@@ -301,6 +306,7 @@ BOOST_AUTO_TEST_CASE(hints_mpeg2)
 {
 	auto film = new_test_film("hints_certificate_validity");
 	film->set_video_encoding(VideoEncoding::MPEG2);
+	film->set_audio_channels(8);
 	auto hints = get_hints(film);
 	BOOST_REQUIRE_EQUAL(hints.size(), 1U);
 	BOOST_CHECK_EQUAL(