Increase timeout on client-server-test.

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index acc389d96cba5d684be4c79fe3c3de53fd4a72f6..7987f92b4b5b59f1b06d54f639e00edaa197f3b6 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -153,14 +153,14 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
  *  @return Encoded data.
  */
 Data
-DCPVideo::encode_remotely (ServerDescription serv)
+DCPVideo::encode_remotely (ServerDescription serv, int timeout)
 {
        boost::asio::io_service io_service;
        boost::asio::ip::tcp::resolver resolver (io_service);
        boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert<string> (Config::instance()->server_port_base ()));
        boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
 
-       shared_ptr<Socket> socket (new Socket);
+       shared_ptr<Socket> socket (new Socket (timeout));
 
        socket->connect (*endpoint_iterator);
 

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 995ceb5479244c1079ed93f975d5c129ff48c2ba..05aa0ff7c31b9e56aea469eb20f050adc6e3ded6 100644 (file)
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -46,7 +46,7 @@ public:
        DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
 
        dcp::Data encode_locally (dcp::NoteHandler note);
-       dcp::Data encode_remotely (ServerDescription);
+       dcp::Data encode_remotely (ServerDescription, int timeout = 30);
 
        int index () const {
                return _index;

diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc
index 16f01f39c23e8c0a1e411209a17a23349100386c..adba746fe5a15ac20ae221031de8d09917e8ddcf 100644 (file)
--- a/src/lib/dcpomatic_socket.cc
+++ b/src/lib/dcpomatic_socket.cc
@@ -22,6 +22,7 @@
 #include "exceptions.h"
 #include <boost/bind.hpp>
 #include <boost/lambda/lambda.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -123,4 +124,3 @@ Socket::read_uint32 ()
        read (reinterpret_cast<uint8_t *> (&v), 4);
        return ntohl (v);
 }
-

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 8399421b55269508a4652968ea1d84699cf99b99..7879d0fc8e1833633465f85d88c0082f72265aeb 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -131,8 +131,8 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
        gettimeofday (&after_encode, 0);
 
        try {
-               socket->write (encoded.size ());
-               socket->write (encoded.data ().get (), encoded.size ());
+               socket->write (encoded.size());
+               socket->write (encoded.data().get(), encoded.size());
        } catch (std::exception& e) {
                cerr << "Send failed; frame " << dcp_video_frame.index() << "\n";
                LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index());

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 7cd965a61ef8846e5d62d1d9c8e52c9c95bc2d79..8a3b0fec484134fae2d2ba90d24981b38bae7ad5 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -47,7 +47,7 @@ void
 do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Data locally_encoded)
 {
        Data remotely_encoded;
-       BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
+       BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
 
        BOOST_CHECK_EQUAL (locally_encoded.size(), remotely_encoded.size());
        BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);