test/integration-http-server.cpp | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
New commits:
commit 7bad7d20769f47d523dab25a57703ac5d749711a
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Aug 23 08:35:55 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Aug 23 08:36:27 2019 +0200
Try to avoid connection refused error in HTTPServerTest::testConvertTo()
In case we fail to send the request, try again in 2 seconds (same value
as the session timeout) before giving up. This seems to be needed for
core.git dbgutil builds; but don't do that unconditionally, in case the
sleep is not needed for optimized core.git.
Change-Id: Ie9ad8c066b7988ca37729f797c4b8dbb0ae2cbd6
diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp
index 08e755eaf..8f36c8205 100644
--- a/test/integration-http-server.cpp
+++ b/test/integration-http-server.cpp
@@ -336,7 +336,16 @@ void HTTPServerTest::testConvertTo()
form.set("format", "txt");
form.addPart("data", new Poco::Net::FilePartSource(srcPath));
form.prepareSubmit(request);
- form.write(session->sendRequest(request));
+ try
+ {
+ form.write(session->sendRequest(request));
+ }
+ catch (const std::exception& ex)
+ {
+ // In case the server is still starting up.
+ sleep(2);
+ form.write(session->sendRequest(request));
+ }
Poco::Net::HTTPResponse response;
std::stringstream actualStream;
@@ -375,7 +384,16 @@ void HTTPServerTest::testConvertToWithForwardedClientIP()
form.set("format", "txt");
form.addPart("data", new Poco::Net::FilePartSource(srcPath));
form.prepareSubmit(request);
- form.write(session->sendRequest(request));
+ try
+ {
+ form.write(session->sendRequest(request));
+ }
+ catch (const std::exception& ex)
+ {
+ // In case the server is still starting up.
+ sleep(2);
+ form.write(session->sendRequest(request));
+ }
Poco::Net::HTTPResponse response;
std::stringstream actualStream;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
