Run all tests with lots of encoding threads.

[dcpomatic.git] / test / threed_test.cc

diff --git a/test/threed_test.cc b/test/threed_test.cc
index c749694c60d827c5cad409bf0251a63b41ce7022..a2c0cfd7dcdf66655a7d0f42d71444f9e9ec76ad 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,13 +23,17 @@
  *  @ingroup completedcp
  */
 
-#include <boost/test/unit_test.hpp>
 #include "test.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
+#include "lib/config.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/video_content.h"
+#include "lib/job_manager.h"
+#include "lib/cross.h"
+#include "lib/job.h"
+#include <boost/test/unit_test.hpp>
 #include <iostream>
 
 using std::cout;
@@ -45,7 +49,6 @@ BOOST_AUTO_TEST_CASE (threed_test1)
        BOOST_REQUIRE (!wait_for_jobs());
 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
-       c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -68,7 +71,6 @@ BOOST_AUTO_TEST_CASE (threed_test2)
        BOOST_REQUIRE (!wait_for_jobs());
 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
-       c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -104,9 +106,9 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
        shared_ptr<Film> film = new_test_film2 ("threed_test4");
-       shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "LEFT_TEST_DCP3D4K.mov"));
+       shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "LEFT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (L);
-       shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov"));
+       shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "RIGHT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (R);
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -123,9 +125,9 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
        shared_ptr<Film> film = new_test_film2 ("threed_test5");
-       shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "boon_telly.mkv"));
+       shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
        film->examine_and_add_content (L);
-       shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "boon_telly.mkv"));
+       shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
        film->examine_and_add_content (R);
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -159,7 +161,7 @@ BOOST_AUTO_TEST_CASE (threed_test6)
        check_dcp ("test/data/threed_test6", film->dir(film->dcp_name()));
 }
 
-/** Check 2D content set as being 3D; this fails with a -114 in some versions */
+/** Check 2D content set as being 3D; this should give an informative error */
 BOOST_AUTO_TEST_CASE (threed_test7)
 {
        shared_ptr<Film> film = new_test_film2 ("threed_test7");
@@ -173,5 +175,31 @@ BOOST_AUTO_TEST_CASE (threed_test7)
        film->make_dcp ();
        film->write_metadata ();
 
-       BOOST_REQUIRE (!wait_for_jobs());
+       JobManager* jm = JobManager::instance ();
+       while (jm->work_to_do ()) {
+               while (signal_manager->ui_idle()) {}
+               dcpomatic_sleep_seconds (1);
+       }
+
+       while (signal_manager->ui_idle ()) {}
+
+       std::cout << "Here's the jobs:\n";
+       BOOST_FOREACH (shared_ptr<Job> i, jm->_jobs) {
+               std::cout << i->name() << " " << i->status() << " " << i->is_new() << " " << i->running() << " " << i->finished() << " " << i->finished_ok() << " " << i->finished_in_error() << "\n";
+       }
+
+       BOOST_REQUIRE (jm->errors());
+       shared_ptr<Job> failed;
+       BOOST_FOREACH (shared_ptr<Job> i, jm->_jobs) {
+               if (i->finished_in_error()) {
+                       BOOST_REQUIRE (!failed);
+                       failed = i;
+               }
+       }
+       BOOST_REQUIRE (failed);
+       BOOST_CHECK_EQUAL (failed->error_summary(), "The content file test/data/red_24.mp4 is set as 3D but does not appear to contain 3D images.  Please set it to 2D.  You can still make a 3D DCP from this content by ticking the 3D option in the DCP video tab.");
+
+       while (signal_manager->ui_idle ()) {}
+
+       JobManager::drop ();
 }