diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-21 17:25:16 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-21 17:25:16 +0200 |
| commit | dfd42d2a546d14c32057a34002543877ea2f99cb (patch) | |
| tree | ccaf3c3edd37c9022bd39f8e263b7f025d550011 /test/client_server_test.cc | |
| parent | 48b82de5b6e8e07330a2f72dbddd8d9830fe047e (diff) | |
| parent | 74d4cd23df7460cf1d0e91fd7a37fa3333741887 (diff) | |
Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
Diffstat (limited to 'test/client_server_test.cc')
| -rw-r--r-- | test/client_server_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 29f901d34..df854f9f3 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */ EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION); @@ -207,7 +207,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */ EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION); @@ -305,7 +305,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */ EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION); |