diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-03-08 17:37:03 +0100 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-04-03 08:14:00 +0000 |
| commit | cce649b65d31353754af9e34148c0e8d4068d3cf (patch) | |
| tree | 3125ee37a7a6a30e2c1aa1fe9fb990e5253aae86 /tests/auto/shared/httpserver.h | |
| parent | ef0bebc89a4d716d4bd3467bcbc971ca4101d974 (diff) | |
Stabilize tst_qwebenginedownloads
The waitForRequest/waitForSignal function used by these tests is broken: it
assumes that calling QEventLoop::exit() will immediately exit from the event
loop. In actuality this is not immediate and the event loop may continue to
execute more signals handlers even after exit() has been called. This means that
in e.g. waitForRequest the 'result' variable may be assigned to twice.
Additionally there is a race condition in downloadTwoLinks, where we sometimes
skip the first download. This is not a bug but simply one pending navigation
being aborted in favor of another.
Changes
- Delete waitForRequest. Define one HTTP request handler per test, using state
variables to communicate with the main body of the test. Ignore unknown
requests (including favicon requests). Same for downloadRequested signals.
- Expand downloadTwoLinks and fix expectations.
- Add logging to HTTPServer.
- Unblacklist.
Task-number: QTBUG-66888
Change-Id: I718cac6c4b32a8cc68400fa8ee5b853686c77fcb
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tests/auto/shared/httpserver.h')
| -rw-r--r-- | tests/auto/shared/httpserver.h | 46 |
1 files changed, 36 insertions, 10 deletions
diff --git a/tests/auto/shared/httpserver.h b/tests/auto/shared/httpserver.h index e45743b7b..ddbab433c 100644 --- a/tests/auto/shared/httpserver.h +++ b/tests/auto/shared/httpserver.h @@ -33,29 +33,55 @@ #include <QTcpServer> #include <QUrl> -#include <memory> - // Listens on a TCP socket and creates HttpReqReps for each connection. +// +// Usage: +// +// HttpServer server; +// connect(&server, &HttpServer::newRequest, [](HttpReqRep *rr) { +// if (rr->requestPath() == "/myPage.html") { +// rr->setResponseBody("<html><body>Hello, World!</body></html>"); +// rr->sendResponse(); +// } +// }); +// QVERIFY(server.start()); +// /* do stuff */ +// QVERIFY(server.stop()); +// +// HttpServer owns the HttpReqRep objects. The signal handler should not store +// references to HttpReqRep objects. +// +// Only if a handler calls sendResponse() will a response be actually sent. This +// means that multiple handlers can be connected to the signal, with different +// handlers responsible for different paths. class HttpServer : public QObject { Q_OBJECT +public: + explicit HttpServer(QObject *parent = nullptr); - QTcpServer m_tcpServer; - QUrl m_url; + // Must be called to start listening. + // + // Returns true if a TCP port has been successfully bound. + Q_REQUIRED_RESULT bool start(); -public: - HttpServer(QObject *parent = nullptr); + // Stops listening and performs final error checks. + Q_REQUIRED_RESULT bool stop(); + + // Full URL for given relative path QUrl url(const QString &path = QStringLiteral("/")) const; Q_SIGNALS: + // Emitted after a HTTP request has been successfully parsed. void newRequest(HttpReqRep *reqRep); private Q_SLOTS: void handleNewConnection(); - void handleReadFinished(bool ok); -}; -// Wait for an HTTP request to be received. -std::unique_ptr<HttpReqRep> waitForRequest(HttpServer *server); +private: + QTcpServer m_tcpServer; + QUrl m_url; + bool m_error = false; +}; #endif // !HTTPSERVER_H |