diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-09 09:30:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-09 07:51:49 +0000 |
| commit | 1d53b6d9f2d7d0427ff56cfa50d98ac97f99c1bc (patch) | |
| tree | d270812c4b648f51090e1262972846b1b4de8116 /tests/auto/network | |
| parent | 89d0a03c067b42155b1a2d310f8514f595abfd61 (diff) | |
| parent | 5cea83a8a2fc3384bb07a7265c8d907171cb1ea4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
Change-Id: Idd3ca5cb9a2b95a4c3513b2a4c8966e6f56193f1
Diffstat (limited to 'tests/auto/network')
| -rw-r--r-- | tests/auto/network/access/http2/tst_http2.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp index e24a06bc34..c264956d7b 100644 --- a/tests/auto/network/access/http2/tst_http2.cpp +++ b/tests/auto/network/access/http2/tst_http2.cpp @@ -477,6 +477,9 @@ void tst_Http2::goaway_data() // - server waits for some time (enough for ur to init several streams on a // client side); then suddenly it replies with GOAWAY, never processing any // request. + if (clearTextHTTP2) + QSKIP("This test requires TLS with ALPN to work"); + QTest::addColumn<int>("responseTimeoutMS"); QTest::newRow("ImmediateGOAWAY") << 0; QTest::newRow("DelayedGOAWAY") << 1000; |