Modified: trunk/Tools/ChangeLog (269429 => 269430)
--- trunk/Tools/ChangeLog 2020-11-05 14:44:28 UTC (rev 269429)
+++ trunk/Tools/ChangeLog 2020-11-05 15:02:39 UTC (rev 269430)
@@ -1,3 +1,27 @@
+2020-11-05 Lauro Moura <[email protected]>
+
+ [GTK] Test /webkit/WebKitWebsiteData/configuration is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=205441
+
+ Reviewed by Carlos Garcia Campos.
+
+ Checking the last 200 runs of gtk-release in the bots, the original
+ error from the report does not appear, but other flakies happened
+ related to checking if some directories were created (namely
+ indexeddb, service-workers and dom-cache). As they are created
+ asynchronously or lazily (i.e. requiring some operation to happen).
+ This could be seen in the WPE bots, not covered by the original
+ expectation, and also reproduced locally by running the test case
+ alone.
+
+ This commit adds some steps/wait time before each of these to make
+ sure the directories are created properly.
+
+ * TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp:
+ (testWebsiteDataConfiguration): Add required steps before checking
+ directories
+ * TestWebKitAPI/glib/TestExpectations.json: Remove expectation
+
2020-11-05 Angelos Oikonomopoulos <[email protected]>
Test that skip_validation is effective
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp (269429 => 269430)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp 2020-11-05 14:44:28 UTC (rev 269429)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp 2020-11-05 15:02:39 UTC (rev 269430)
@@ -166,6 +166,7 @@
test->waitUntilLoadFinished();
test->runJavaScriptAndWaitUntilFinished("window.indexedDB.open('TestDatabase');", nullptr);
GUniquePtr<char> indexedDBDirectory(g_build_filename(Test::dataDirectory(), "indexeddb", nullptr));
+ test->waitUntilFileChanged(indexedDBDirectory.get(), G_FILE_MONITOR_EVENT_CREATED);
g_assert_cmpstr(indexedDBDirectory.get(), ==, webkit_website_data_manager_get_indexeddb_directory(test->m_manager));
g_assert_true(g_file_test(indexedDBDirectory.get(), G_FILE_TEST_IS_DIR));
@@ -190,11 +191,15 @@
GUniquePtr<char> itpDirectory(g_build_filename(Test::dataDirectory(), "itp", nullptr));
g_assert_cmpstr(itpDirectory.get(), ==, webkit_website_data_manager_get_itp_directory(test->m_manager));
+ test->runJavaScriptAndWaitUntilFinished("navigator.serviceWorker.register('./some-dummy.js');", nullptr);
GUniquePtr<char> swRegistrationsDirectory(g_build_filename(Test::dataDirectory(), "serviceworkers", nullptr));
+ test->waitUntilFileChanged(swRegistrationsDirectory.get(), G_FILE_MONITOR_EVENT_CREATED);
g_assert_cmpstr(swRegistrationsDirectory.get(), ==, webkit_website_data_manager_get_service_worker_registrations_directory(test->m_manager));
g_assert_true(g_file_test(swRegistrationsDirectory.get(), G_FILE_TEST_IS_DIR));
+ test->runJavaScriptAndWaitUntilFinished("caches.open('my-cache');", nullptr);
GUniquePtr<char> domCacheDirectory(g_build_filename(Test::dataDirectory(), "dom-cache", nullptr));
+ test->waitUntilFileChanged(domCacheDirectory.get(), G_FILE_MONITOR_EVENT_CREATED);
g_assert_cmpstr(domCacheDirectory.get(), ==, webkit_website_data_manager_get_dom_cache_directory(test->m_manager));
g_assert_true(g_file_test(domCacheDirectory.get(), G_FILE_TEST_IS_DIR));
Modified: trunk/Tools/TestWebKitAPI/glib/TestExpectations.json (269429 => 269430)
--- trunk/Tools/TestWebKitAPI/glib/TestExpectations.json 2020-11-05 14:44:28 UTC (rev 269429)
+++ trunk/Tools/TestWebKitAPI/glib/TestExpectations.json 2020-11-05 15:02:39 UTC (rev 269430)
@@ -66,9 +66,6 @@
"/webkit/WebKitWebsiteData/storage": {
"expected": { "wpe": {"status": ["PASS", "FAIL"]}}
},
- "/webkit/WebKitWebsiteData/configuration": {
- "expected": {"gtk": {"status": ["PASS", "FAIL"], "bug": "webkit.org/b/205441"}}
- },
"/webkit/WebKitWebsiteData/dom-cache": {
"expected": {
"gtk": {"status": ["PASS", "FAIL"], "bug": "webkit.org/b/213785"},
