Merge master; fix destruction of Server; some test cleanups.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index 2412fc31299799411ed60608a33395886cad26f3..d480602422b0ee1a810cfc74a1e38c0ad575eb1b 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
        film->examine_and_add_content (C);
        wait_for_jobs ();
 
-       BOOST_CHECK_EQUAL (A->full_length(), DCPTime::from_seconds (3));
+       BOOST_CHECK_EQUAL (A->full_length(), DCPTime (280000));
 
        A->set_position (DCPTime::from_seconds (0));
        B->set_position (DCPTime::from_seconds (10));