summaryrefslogtreecommitdiff
path: root/test/helpers.hpp
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-03-20 09:16:22 +0100
committerMiklos Vajna <vmiklos@collabora.com>2020-03-20 10:47:59 +0100
commita83dd9a1608b1bdb2569937762a88aeaadee831c (patch)
tree2c9573c6017c4ff46739057e90eb5a08c4551cee /test/helpers.hpp
parent7285fad0f9b076b9667b9c254dd2f54a88ea67f9 (diff)
test: increase load timeout in UnitLoadTorture
This test sometimes failed on me just because the load was aborted due to the timeout, doubling the limit makes the problem go away. Change-Id: Ided724d67a513391b86836065d4e627581857a92 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90771 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'test/helpers.hpp')
-rw-r--r--test/helpers.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/helpers.hpp b/test/helpers.hpp
index 46aef7605..1b831a289 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -311,7 +311,7 @@ std::vector<char> getResponseMessage(LOOLWebSocket& ws, const std::string& prefi
auto now = std::chrono::steady_clock::now();
if (now > endTime) // timedout
{
- TST_LOG("Timeout.");
+ TST_LOG("Timeout after " << timeoutMs << " ms.");
break;
}
long waitTimeUs = std::chrono::duration_cast<std::chrono::microseconds>(endTime - now).count();
@@ -378,9 +378,9 @@ std::string getResponseString(T& ws, const std::string& prefix, const std::strin
}
template <typename T>
-std::string assertResponseString(T& ws, const std::string& prefix, const std::string& testname)
+std::string assertResponseString(T& ws, const std::string& prefix, const std::string& testname, const size_t timeoutMs = 10000)
{
- const auto res = getResponseString(ws, prefix, testname);
+ const auto res = getResponseString(ws, prefix, testname, timeoutMs);
LOK_ASSERT_EQUAL(prefix, res.substr(0, prefix.length()));
return res;
}