Skip to content

Commit bda7aba

Browse files
Test gardening for GTK.
https://bugs.webkit.org/show_bug.cgi?id=181477 Unreviewed test gardening. Tools: * TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp: Correct the file name. * TestWebKitAPI/Tests/WebKitGLib/TestConsoleMessage.cpp: Adjust the expected console message. LayoutTests: * http/tests/performance/performance-resource-timing-cached-entries-expected.txt: * http/tests/performance/performance-resource-timing-cached-entries.html: The code to debug this test's flakiness made it more flaky, as the resources are not logged in a consistent order. This ensures they are logged only in case of failure. * platform/gtk/TestExpectations: - svg/custom/non-scaling-stroke.svg was fixed in r226443. - imported/w3c/web-platform-tests/css/css-shapes-1/shape-outside/values/shape-margin-001.html was fixed in r226404. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@226782 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 091adb3 commit bda7aba

File tree

7 files changed

+45
-22
lines changed

7 files changed

+45
-22
lines changed

LayoutTests/ChangeLog

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2018-01-11 Ms2ger <[email protected]>
2+
3+
Test gardening for GTK.
4+
https://bugs.webkit.org/show_bug.cgi?id=181477
5+
6+
Unreviewed test gardening.
7+
8+
* http/tests/performance/performance-resource-timing-cached-entries-expected.txt:
9+
* http/tests/performance/performance-resource-timing-cached-entries.html:
10+
The code to debug this test's flakiness made it more flaky, as the
11+
resources are not logged in a consistent order. This ensures they are
12+
logged only in case of failure.
13+
* platform/gtk/TestExpectations:
14+
- svg/custom/non-scaling-stroke.svg was fixed in r226443.
15+
- imported/w3c/web-platform-tests/css/css-shapes-1/shape-outside/values/shape-margin-001.html
16+
was fixed in r226404.
17+
118
2018-01-11 Miguel Gomez <[email protected]>
219

320
Unreviewed GTK+ and WPE gardening after r226773.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
CONSOLE MESSAGE: line 9: current entries: 0
2-
CONSOLE MESSAGE: line 18: entry: http://127.0.0.1:8000/resources/js-test-pre.js
3-
CONSOLE MESSAGE: line 18: entry: http://127.0.0.1:8000/resources/square100.png
4-
CONSOLE MESSAGE: line 18: entry: http://127.0.0.1:8000/resources/square100.png
5-
PASS foundResource is 2
2+
PASS foundResources.length is 2
63

LayoutTests/http/tests/performance/performance-resource-timing-cached-entries.html

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111
<script src="../../resources/js-test-pre.js"></script>
1212
<img src="../../resources/square100.png">
1313
<script>
14-
var foundResource = 0;
14+
var foundResources = [];
1515
var runTest = function() {
1616
var resources = performance.getEntriesByType('resource');
1717
for (var i = 0; i < resources.length; ++i) {
18-
console.log("entry: " + resources[i].name);
1918
if (resources[i].name.indexOf("square") != -1)
20-
++foundResource;
19+
foundResources.push(resources[i].name);
2120
};
22-
shouldBe("foundResource", "2");
21+
shouldBe("foundResources.length", "2");
22+
if (foundResources.length !== 2) {
23+
console.log(foundResources);
24+
}
2325
if (window.testRunner)
2426
testRunner.notifyDone();
2527
};

LayoutTests/platform/gtk/TestExpectations

-3
Original file line numberDiff line numberDiff line change
@@ -2587,8 +2587,6 @@ webkit.org/b/74282 editing/pasteboard/emacs-ctrl-k-with-move.html [ Failure ]
25872587

25882588
webkit.org/b/81320 editing/pasteboard/copy-two-pasteboard-types-both-work.html [ Failure ]
25892589

2590-
webkit.org/b/86971 svg/custom/non-scaling-stroke.svg [ Failure ]
2591-
25922590
webkit.org/b/84679 css3/zoom-coords.xhtml [ Failure ]
25932591

25942592
webkit.org/b/84694 fast/events/selectstart-by-double-triple-clicks.html [ Failure ]
@@ -2688,7 +2686,6 @@ webkit.org/b/180581 css3/shapes/shape-outside/values/shape-outside-ellipse-005.h
26882686
webkit.org/b/180581 css3/shapes/shape-outside/values/shape-outside-inset-003.html [ Failure ]
26892687
webkit.org/b/180581 css3/shapes/shape-outside/values/shape-outside-polygon-004.html [ Failure ]
26902688
webkit.org/b/180581 css3/shapes/shape-outside/values/shape-outside-shape-arguments-000.html [ Failure ]
2691-
webkit.org/b/180581 imported/w3c/web-platform-tests/css/css-shapes-1/shape-outside/values/shape-margin-001.html [ Failure ]
26922689
webkit.org/b/180581 imported/w3c/web-platform-tests/css/css-shapes-1/shape-outside/values/shape-outside-circle-004.html [ Failure ]
26932690
webkit.org/b/180581 imported/w3c/web-platform-tests/css/css-shapes-1/shape-outside/values/shape-outside-circle-005.html [ Failure ]
26942691
webkit.org/b/180581 imported/w3c/web-platform-tests/css/css-shapes-1/shape-outside/values/shape-outside-ellipse-004.html [ Failure ]

Tools/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2018-01-11 Ms2ger <[email protected]>
2+
3+
Test gardening for GTK.
4+
https://bugs.webkit.org/show_bug.cgi?id=181477
5+
6+
Unreviewed test gardening.
7+
8+
* TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp: Correct the file name.
9+
* TestWebKitAPI/Tests/WebKitGLib/TestConsoleMessage.cpp: Adjust the expected console message.
10+
111
2018-01-11 Carlos Alberto Lopez Perez <[email protected]>
212

313
Add the new JSCOnly bot to the scheduler.

Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -410,16 +410,16 @@ void beforeAll()
410410
kServer = new WebKitTestServer();
411411
kServer->run(serverCallback);
412412

413-
AuthenticationTest::add("WebKitWebView", "authentication-request", testWebViewAuthenticationRequest);
414-
AuthenticationTest::add("WebKitWebView", "authentication-cancel", testWebViewAuthenticationCancel);
415-
AuthenticationTest::add("WebKitWebView", "authentication-load-cancelled", testWebViewAuthenticationLoadCancelled);
416-
AuthenticationTest::add("WebKitWebView", "authentication-success", testWebViewAuthenticationSuccess);
417-
AuthenticationTest::add("WebKitWebView", "authentication-failure", testWebViewAuthenticationFailure);
418-
AuthenticationTest::add("WebKitWebView", "authentication-no-credential", testWebViewAuthenticationNoCredential);
419-
AuthenticationTest::add("WebKitWebView", "authentication-storage", testWebViewAuthenticationStorage);
420-
AuthenticationTest::add("WebKitWebView", "authentication-empty-realm", testWebViewAuthenticationEmptyRealm);
421-
ProxyAuthenticationTest::add("WebKitWebView", "authentication-proxy", testWebViewAuthenticationProxy);
422-
ProxyAuthenticationTest::add("WebKitWebView", "authentication-proxy-https", testWebViewAuthenticationProxyHTTPS);
413+
AuthenticationTest::add("Authentication", "authentication-request", testWebViewAuthenticationRequest);
414+
AuthenticationTest::add("Authentication", "authentication-cancel", testWebViewAuthenticationCancel);
415+
AuthenticationTest::add("Authentication", "authentication-load-cancelled", testWebViewAuthenticationLoadCancelled);
416+
AuthenticationTest::add("Authentication", "authentication-success", testWebViewAuthenticationSuccess);
417+
AuthenticationTest::add("Authentication", "authentication-failure", testWebViewAuthenticationFailure);
418+
AuthenticationTest::add("Authentication", "authentication-no-credential", testWebViewAuthenticationNoCredential);
419+
AuthenticationTest::add("Authentication", "authentication-storage", testWebViewAuthenticationStorage);
420+
AuthenticationTest::add("Authentication", "authentication-empty-realm", testWebViewAuthenticationEmptyRealm);
421+
ProxyAuthenticationTest::add("Authentication", "authentication-proxy", testWebViewAuthenticationProxy);
422+
ProxyAuthenticationTest::add("Authentication", "authentication-proxy-https", testWebViewAuthenticationProxyHTTPS);
423423
}
424424

425425
void afterAll()

Tools/TestWebKitAPI/Tests/WebKitGLib/TestConsoleMessage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static void testWebKitConsoleMessageJavaScriptException(ConsoleMessageTest* test
125125
static void testWebKitConsoleMessageNetworkError(ConsoleMessageTest* test, gconstpointer)
126126
{
127127
ConsoleMessageTest::ConsoleMessage referenceMessage = { ConsoleMessageTest::MessageSource::Network, ConsoleMessageTest::MessageLevel::Error,
128-
"Failed to load resource: The resource at /org/webkit/glib/tests/not-found.css does not exist", 0, "resource:///org/webkit/glib/tests/not-found.css" };
128+
"Failed to load resource: The resource at '/org/webkit/glib/tests/not-found.css' does not exist", 0, "resource:///org/webkit/glib/tests/not-found.css" };
129129
test->loadHtml("<html><head><link rel='stylesheet' href='not-found.css' type='text/css'></head><body></body></html>", "resource:///org/webkit/glib/tests/");
130130
test->waitUntilConsoleMessageReceived();
131131
g_assert(test->m_consoleMessage == referenceMessage);

0 commit comments

Comments
 (0)