diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-17 20:10:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-17 20:10:34 +0100 |
| commit | bc4cd465dd5df82e13f3c7709166ee11289d219f (patch) | |
| tree | d6323aaed6383e589fbefb6057648c22bb187c76 /tests/auto/network | |
| parent | 43daefb0962794b2df256cae1098e889b9b36f12 (diff) | |
| parent | 07745d7bfbf6c8d83e0243150d8ce934675dea87 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
qmake/Makefile.unix
Change-Id: Ia18e391198222eef34ffa2df6f683e052058d032
Diffstat (limited to 'tests/auto/network')
| -rw-r--r-- | tests/auto/network/access/http2/tst_http2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp index 645d28ccb3..e7609b3243 100644 --- a/tests/auto/network/access/http2/tst_http2.cpp +++ b/tests/auto/network/access/http2/tst_http2.cpp @@ -540,6 +540,8 @@ void tst_Http2::clientPrefaceError() void tst_Http2::serverSettingsAcked() { serverGotSettingsACK = true; + if (!nRequests) + stopEventLoop(); } void tst_Http2::invalidFrame() @@ -592,7 +594,7 @@ void tst_Http2::replyFinished() QCOMPARE(reply->error(), QNetworkReply::NoError); --nRequests; - if (!nRequests) + if (!nRequests && serverGotSettingsACK) stopEventLoop(); } |