adjusting for xvfb and slow test machines

diff --git a/tst/integration/ClientTest.cpp b/tst/integration/ClientTest.cpp
index 93a17d4223e485324e8a217758cb1d4944a6a3f1..b9f0937f4120984df9d6160c4c7d509dc49a64c9 100644 (file)
--- a/tst/integration/ClientTest.cpp
+++ b/tst/integration/ClientTest.cpp
@@ -15,7 +15,7 @@ void ClientTest::setUp() {
        server->AssertRunning();
        server->AssertOutputLine("loading spawn chunks");
        server->AssertOutputLine("listening on UDP port 12354");
-       client.reset(new TestInstance({ "--client" }));
+       client.reset(new TestInstance({ "--client", "--no-vsync" }));
        client->AssertRunning();
        client->AssertOutputLine("got message before interface was created: player \"default\" joined");
        client->AssertOutputLine("joined game \"default\"");

diff --git a/tst/integration/TestInstance.cpp b/tst/integration/TestInstance.cpp
index fe61fdc12a156dc6da5c8eadb67938d903b3352d..135d17c02b0d9ce750742fd2f0c81473b8e06ebd 100644 (file)
--- a/tst/integration/TestInstance.cpp
+++ b/tst/integration/TestInstance.cpp
@@ -67,7 +67,7 @@ void TestInstance::WriteInput(const string &data) {
 void TestInstance::ReadOutputLine(string &line) {
        while (!out_buf.Extract(line)) {
                // buffer exhausted, fetch more data
-               int len = proc.ReadOut(out_buf.WriteHead(), out_buf.Remain(), 5000);
+               int len = proc.ReadOut(out_buf.WriteHead(), out_buf.Remain(), 10000);
                if (len == 0) {
                        throw runtime_error("failed read from stdout of " + name);
                }
@@ -120,7 +120,7 @@ void TestInstance::ExhaustOutput(string &output) {
                        output += '\n';
                } else {
                        // buffer exhausted, fetch more data
-                       int len = proc.ReadOut(out_buf.WriteHead(), out_buf.Remain(), 5000);
+                       int len = proc.ReadOut(out_buf.WriteHead(), out_buf.Remain(), 10000);
                        if (len == 0) {
                                // eof
                                return;
@@ -142,7 +142,7 @@ void TestInstance::AssertNoOutput() {
 void TestInstance::ReadErrorLine(string &line) {
        while (!err_buf.Extract(line)) {
                // buffer exhausted, fetch more data
-               int len = proc.ReadErr(err_buf.WriteHead(), err_buf.Remain(), 5000);
+               int len = proc.ReadErr(err_buf.WriteHead(), err_buf.Remain(), 10000);
                if (len == 0) {
                        throw runtime_error("failed read from stderr of " + name);
                }
@@ -195,7 +195,7 @@ void TestInstance::ExhaustError(string &error) {
                        error += '\n';
                } else {
                        // buffer exhausted, fetch more data
-                       int len = proc.ReadErr(err_buf.WriteHead(), err_buf.Remain(), 5000);
+                       int len = proc.ReadErr(err_buf.WriteHead(), err_buf.Remain(), 10000);
                        if (len == 0) {
                                // eof
                                return;