diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-10-29 16:55:39 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-10-30 10:30:46 +0000 |
| commit | 6c909a25d0f0e358dfc8fefd55d18f704ba26c80 (patch) | |
| tree | c271c2f3fb51fb65c393186c6fe110639e355b3b /tests | |
| parent | cfee452174c58fe4048b1604503d03de2764fc8e (diff) | |
enable tests/auto/core
Enable autotests and blacklist tests that are known to fail.
Add skips and waits and mark them with the corresponding task numbers.
Change-Id: I993e366ba3b07239a8ba15eae2ee8e3e2aaa8308
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'tests')
3 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/core/qwebenginecookiestoreclient/tst_qwebenginecookiestoreclient.cpp b/tests/auto/core/qwebenginecookiestoreclient/tst_qwebenginecookiestoreclient.cpp index d78a81c21..ed2a5a55b 100644 --- a/tests/auto/core/qwebenginecookiestoreclient/tst_qwebenginecookiestoreclient.cpp +++ b/tests/auto/core/qwebenginecookiestoreclient/tst_qwebenginecookiestoreclient.cpp @@ -121,6 +121,7 @@ void tst_QWebEngineCookieStoreClient::cookieSignals() void tst_QWebEngineCookieStoreClient::setAndDeleteCookie() { + QTest::qWait(500); // remove, when QTBUG-47946 is fixed! QWebEngineView view; QWebEngineCookieStoreClient *client = view.page()->profile()->cookieStoreClient(); @@ -158,6 +159,7 @@ void tst_QWebEngineCookieStoreClient::setAndDeleteCookie() void tst_QWebEngineCookieStoreClient::batchCookieTasks() { + QTest::qWait(500); // remove, when QTBUG-47946 is fixed! QWebEngineView view; QWebEngineCookieStoreClient *client = view.page()->profile()->cookieStoreClient(); diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp index 4891cafd0..4a261c46b 100644 --- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp +++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp @@ -146,7 +146,6 @@ void tst_QWebEngineUrlRequestInterceptor::interceptRequest() loadSpy.clear(); QCOMPARE(interceptor.observedUrls.count(), 4); - // Make sure that registering an observer does not modify the request. TestRequestInterceptor observer(/* intercept */ false); view.page()->profile()->setRequestInterceptor(&observer); diff --git a/tests/auto/core/tests.pri b/tests/auto/core/tests.pri index cd6ef8615..606ed2a8c 100644 --- a/tests/auto/core/tests.pri +++ b/tests/auto/core/tests.pri @@ -1,8 +1,6 @@ TEMPLATE = app -# FIXME: Re-enable once we want to run tests on the CI -# CONFIG += testcase - +CONFIG += testcase CONFIG += c++11 VPATH += $$_PRO_FILE_PWD_ |