X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=cfac511b32e9e78f285eab944e58f8436b781a5c;hb=f7b6c0595fe13be3f4a10bcce88dd895b1111b57;hp=8107aa77a0300e560607f8d21ca2f85d78265da4;hpb=ed696661eff88297b4ad51625d596248697b1891;p=dcpomatic.git

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 8107aa77a..cfac511b3 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -54,6 +54,8 @@ using std::make_shared;
 /** Make an encrypted DCP, import it and make a new unencrypted DCP */
 BOOST_AUTO_TEST_CASE (import_dcp_test)
 {
+	ConfigRestorer cr;
+
 	auto A = new_test_film ("import_dcp_test");
 	A->set_container (Ratio::from_id ("185"));
 	A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
@@ -70,9 +72,8 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 	dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name());
 	A_dcp.read ();
 
-	Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain>(openssl_path()));
+	Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain>(openssl_path(), CERTIFICATE_VALIDITY_PERIOD));
 
-	/* Dear future-carl: I suck!  I thought you wouldn't still be running these tests in 2030!  Sorry! */
 	auto kdm = A->make_kdm (
 		Config::instance()->decryption_chain()->leaf (),
 		vector<string>(),
@@ -100,9 +101,6 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 
 	/* Should be 1s red, 1s green, 1s blue */
 	check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name());
-
-	/* Restore the reference decryption chain */
-	setup_test_config ();
 }