diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2020-01-17 20:49:38 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-01-21 15:07:54 +0000 |
| commit | 9dfac6dab13f59e418e81933be4c02396dd46c40 (patch) | |
| tree | 2909b18be0689d56308b88595c35bd3c1a4c3dd0 /test/helpers.hpp | |
| parent | 0599db3576838fcd3d736a2c93db0c7e0024f812 (diff) | |
test: switch to parallel tests based on Unit framework.
Increase a few timeouts, bin old-style standalone unit tests,
fix a number of bugs.
Change-Id: Ia3d59466ecb9a9443807ba3445d04dd5f77e3dba
Diffstat (limited to 'test/helpers.hpp')
| -rw-r--r-- | test/helpers.hpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/helpers.hpp b/test/helpers.hpp index f09de8bbb..dd638d191 100644 --- a/test/helpers.hpp +++ b/test/helpers.hpp @@ -390,8 +390,12 @@ inline bool isDocumentLoaded(LOOLWebSocket& ws, const std::string& testname, bool isView = true) { const std::string prefix = isView ? "status:" : "statusindicatorfinish:"; - const auto message = getResponseString(ws, prefix, testname); - return LOOLProtocol::matchPrefix(prefix, message); + // Allow 20 secs to load + const auto message = getResponseString(ws, prefix, testname, 30 * 1000); + bool success = LOOLProtocol::matchPrefix(prefix, message); + if (!success) + TST_LOG("ERR: Timed out loading document"); + return success; } inline |