diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
| commit | 0da7c88a1afb221f97e2e96c159b1a984e4e2f71 (patch) | |
| tree | 558590d5ad0a2ced262c2142915b738d898ddbf0 /test/player_test.cc | |
| parent | 4a677ee9e750efc330c29df69f19dae27f09aa4d (diff) | |
| parent | da38ed791a5a46a97b26947409cf837b7939fd54 (diff) | |
Merge master; fix destruction of Server; some test cleanups.
Diffstat (limited to 'test/player_test.cc')
| -rw-r--r-- | test/player_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/player_test.cc b/test/player_test.cc index 2412fc312..d48060242 100644 --- 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)); |