loolwsd/test/helpers.hpp | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 78be068a7ff7701cca3be25b0019fb3192f79b30
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Tue Nov 15 16:22:02 2016 -0500
loolwsd: test: retry connection failures
Change-Id: Iff2cf05bf755ba0df08304af9f2cc6c488e18428
Reviewed-on: https://gerrit.libreoffice.org/30885
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/test/helpers.hpp b/loolwsd/test/helpers.hpp
index 737601c..30aeac1 100644
--- a/loolwsd/test/helpers.hpp
+++ b/loolwsd/test/helpers.hpp
@@ -348,15 +348,24 @@ connectLOKit(const Poco::URI& uri,
int retries = 10;
do
{
- std::unique_ptr<Poco::Net::HTTPClientSession>
session(createSession(uri));
- auto ws = std::make_shared<LOOLWebSocket>(*session, request, response);
- const auto expected_response = "statusindicator: ready";
- if (getResponseString(ws, expected_response, name) ==
expected_response)
+ try
{
- return ws;
+ std::unique_ptr<Poco::Net::HTTPClientSession>
session(createSession(uri));
+ auto ws = std::make_shared<LOOLWebSocket>(*session, request,
response);
+ const auto expected_response = "statusindicator: ready";
+ if (getResponseString(ws, expected_response, name) ==
expected_response)
+ {
+ return ws;
+ }
+
+ std::cerr << (11 - retries);
+ }
+ catch (const std::exception& ex)
+ {
+ std::cerr << std::endl << "Error connecting: " << ex.what() <<
std::endl;
}
- std::cerr << (11 - retries);
+
std::this_thread::sleep_for(std::chrono::milliseconds(POLL_TIMEOUT_MS));
}
while (retries--);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
