Attempt to fix test idle hacks.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index b86796bbd1b6bd7ad19862eb1bc5d920c769f90b..366bc9302937330d12d0a3d0fd27ef250cfc3a7b 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -21,12 +21,6 @@
  *  @brief Overall test stuff and useful methods for tests.
  */
 
-#include <vector>
-#include <list>
-#include <Magick++.h>
-#include <sndfile.h>
-#include <libxml++/libxml++.h>
-#include <dcp/dcp.h>
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/signal_manager.h"
@@ -36,9 +30,18 @@
 #include "lib/cross.h"
 #include "lib/server_finder.h"
 #include "lib/image.h"
+#include "lib/ratio.h"
+#include "lib/log_entry.h"
+#include <dcp/dcp.h>
+#include <sndfile.h>
+#include <libxml++/libxml++.h>
+#include <Magick++.h>
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
+#include <list>
+#include <vector>
+#include <iostream>
 
 using std::string;
 using std::vector;
@@ -75,6 +78,7 @@ struct TestConfig
                Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
                Config::instance()->set_default_audio_delay (0);
                Config::instance()->set_default_j2k_bandwidth (100000000);
+               Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
 
                ServerFinder::instance()->disable ();
 
@@ -290,11 +294,10 @@ wait_for_jobs ()
 {
        JobManager* jm = JobManager::instance ();
        while (jm->work_to_do ()) {
-               signal_manager->ui_idle ();
+               while (signal_manager->ui_idle ()) {}
+               dcpomatic_sleep (1);
        }
 
-       cout << "Waiting for jobs: all finished; errors=" << jm->errors() << ".\n";
-
        if (jm->errors ()) {
                int N = 0;
                for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
@@ -313,13 +316,10 @@ wait_for_jobs ()
                }
        }
 
-       signal_manager->ui_idle ();
+       while (signal_manager->ui_idle ()) {}
 
        if (jm->errors ()) {
-               cout << "Dropping JobManager\n";
                JobManager::drop ();
-       } else {
-               cout << "Not dropping JobManager\n";
        }
 }