diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-03 11:21:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-03 11:21:43 +0100 |
| commit | 8587a7420141a37c548b66f5383296eb5631c89d (patch) | |
| tree | 78a1327dba409379107a3cae48f7ba2f0ab6fdee | |
| parent | 480b9827e33c315aff7ea92e30d7b9a050e8a1b5 (diff) | |
| parent | d366e853399d3247077aa1a04d8b6d6ef38c7cfc (diff) | |
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
| -rw-r--r-- | test/dcp_decoder_test.cc | 4 | ||||
| -rw-r--r-- | test/import_dcp_test.cc | 5 | ||||
| -rw-r--r-- | test/remake_id_test.cc | 4 | ||||
| -rw-r--r-- | test/vf_kdm_test.cc | 8 |
4 files changed, 11 insertions, 10 deletions
diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc index 64d35a2eb..32eed9354 100644 --- a/test/dcp_decoder_test.cc +++ b/test/dcp_decoder_test.cc @@ -75,8 +75,8 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) Config::instance()->decryption_chain()->leaf(), vector<string>(), encrypted_dcp.cpls().front()->file().get(), - dcp::LocalTime ("2014-07-21T00:00:00+00:00"), - dcp::LocalTime ("2024-07-21T00:00:00+00:00"), + dcp::LocalTime ("2030-07-21T00:00:00+00:00"), + dcp::LocalTime ("2031-07-21T00:00:00+00:00"), dcp::MODIFIED_TRANSITIONAL_1, true, 0 ); diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 71689f613..16ebfa454 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -64,12 +64,13 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) Config::instance()->set_decryption_chain (shared_ptr<dcp::CertificateChain> (new dcp::CertificateChain (openssl_path ()))); + /* Dear future-carl: I suck! I thought you wouldn't still be running these tests in 2030! Sorry! */ dcp::EncryptedKDM kdm = A->make_kdm ( Config::instance()->decryption_chain()->leaf (), vector<string>(), A_dcp.cpls().front()->file().get(), - dcp::LocalTime ("2014-07-21T00:00:00+00:00"), - dcp::LocalTime ("2024-07-21T00:00:00+00:00"), + dcp::LocalTime ("2030-07-21T00:00:00+00:00"), + dcp::LocalTime ("2031-07-21T00:00:00+00:00"), dcp::MODIFIED_TRANSITIONAL_1, true, 0 ); diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc index 349884f91..2a96a1488 100644 --- a/test/remake_id_test.cc +++ b/test/remake_id_test.cc @@ -93,8 +93,8 @@ BOOST_AUTO_TEST_CASE (remake_id_test2) Config::instance()->decryption_chain()->leaf(), vector<string>(), *cpl, - dcp::LocalTime ("2012-01-01T01:00:00+00:00"), - dcp::LocalTime ("2112-01-01T01:00:00+00:00"), + dcp::LocalTime ("2030-01-01T01:00:00+00:00"), + dcp::LocalTime ("2031-01-01T01:00:00+00:00"), dcp::MODIFIED_TRANSITIONAL_1, true, 0 diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc index a28ea5b7e..f37742c03 100644 --- a/test/vf_kdm_test.cc +++ b/test/vf_kdm_test.cc @@ -66,8 +66,8 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) Config::instance()->decryption_chain()->leaf (), vector<string>(), A_dcp.cpls().front()->file().get(), - dcp::LocalTime ("2014-07-21T00:00:00+00:00"), - dcp::LocalTime ("2024-07-21T00:00:00+00:00"), + dcp::LocalTime ("2030-07-21T00:00:00+00:00"), + dcp::LocalTime ("2031-07-21T00:00:00+00:00"), dcp::MODIFIED_TRANSITIONAL_1, true, 0 ); @@ -96,8 +96,8 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) Config::instance()->decryption_chain()->leaf (), vector<string>(), B_dcp.cpls().front()->file().get(), - dcp::LocalTime ("2014-07-21T00:00:00+00:00"), - dcp::LocalTime ("2024-07-21T00:00:00+00:00"), + dcp::LocalTime ("2030-07-21T00:00:00+00:00"), + dcp::LocalTime ("2031-07-21T00:00:00+00:00"), dcp::MODIFIED_TRANSITIONAL_1, true, 0 ); |