From 5408130b6267448d0fddf4e3001fdc4b915e6496 Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Fri, 25 Nov 2016 14:31:45 +0100 Subject: [PATCH] adjusting for xvfb and slow test machines --- tst/integration/ClientTest.cpp | 2 +- tst/integration/TestInstance.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tst/integration/ClientTest.cpp b/tst/integration/ClientTest.cpp index 93a17d4..b9f0937 100644 --- 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 fe61fdc..135d17c 100644 --- 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; -- 2.39.2