Diff
Modified: trunk/LayoutTests/ChangeLog (206262 => 206263)
--- trunk/LayoutTests/ChangeLog 2016-09-22 17:59:34 UTC (rev 206262)
+++ trunk/LayoutTests/ChangeLog 2016-09-22 18:19:49 UTC (rev 206263)
@@ -1,3 +1,17 @@
+2016-09-22 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r206112.
+
+ This change made inspector/network/xhr-json-blob-has-
+ content.html very flaky.
+
+ Reverted changeset:
+
+ "Web Inspector: adopt Object.awaitEvent in
+ LayoutTests/inspector/network"
+ https://bugs.webkit.org/show_bug.cgi?id=162099
+ http://trac.webkit.org/changeset/206112
+
2016-09-22 Youenn Fablet <you...@apple.com>
imported/w3c/web-platform-tests/resource-timing/idlharness.html is flaky
Modified: trunk/LayoutTests/inspector/network/client-blocked-load-expected.txt (206262 => 206263)
--- trunk/LayoutTests/inspector/network/client-blocked-load-expected.txt 2016-09-22 17:59:34 UTC (rev 206262)
+++ trunk/LayoutTests/inspector/network/client-blocked-load-expected.txt 2016-09-22 18:19:49 UTC (rev 206263)
@@ -4,6 +4,6 @@
== Running test suite: ClientBlockedResourceLoad
-- Running test case: TriggerBlockedResourceLoad
PASS: Resource should be created.
-PASS: Added Resource load did fail.
PASS: Request url should be rewritten to the null string.
+PASS: Resource load should fail.
Modified: trunk/LayoutTests/inspector/network/client-blocked-load.html (206262 => 206263)
--- trunk/LayoutTests/inspector/network/client-blocked-load.html 2016-09-22 17:59:34 UTC (rev 206262)
+++ trunk/LayoutTests/inspector/network/client-blocked-load.html 2016-09-22 18:19:49 UTC (rev 206263)
@@ -18,20 +18,17 @@
suite.addTestCase({
name: "TriggerBlockedResourceLoad",
description: "Trigger a blocked resource load and ensure we get notified of the request.",
- test(resolve, reject) {
- Promise.all([
- WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded),
- WebInspector.Resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFail)
- ])
- .then(([resourceWasAddedEvent, loadingDidFailEvent]) => {
- let resource = resourceWasAddedEvent.data.resource;
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createBlockedResourceLoad()");
+ WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
+ let resource = event.data.resource;
InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
- InspectorTest.expectThat(resource === loadingDidFailEvent.target, "Added Resource load did fail.");
InspectorTest.expectThat(resource.url ="" "", "Request url should be rewritten to the null string.");
- })
- .then(resolve, reject);
-
- InspectorTest.evaluateInPage("createBlockedResourceLoad()");
+ resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFail, (event) => {
+ InspectorTest.pass("Resource load should fail.");
+ resolve();
+ });
+ });
}
});
Modified: trunk/LayoutTests/inspector/network/xhr-json-blob-has-content.html (206262 => 206263)
--- trunk/LayoutTests/inspector/network/xhr-json-blob-has-content.html 2016-09-22 17:59:34 UTC (rev 206262)
+++ trunk/LayoutTests/inspector/network/xhr-json-blob-has-content.html 2016-09-22 18:19:49 UTC (rev 206263)
@@ -25,25 +25,18 @@
suite.addTestCase({
name: "XHR.JSONContent",
description: "Ensure an XMLHttpRequest with JSON content still gives us text.",
- test(resolve, reject) {
- let resource = null;
-
- WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded)
- .then((event) => {
- resource = event.data.resource;
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createJSONXHR()");
+ WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
+ let resource = event.data.resource;
InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
- return resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFinish);
- })
- .then((event) => {
- InspectorTest.pass("Resource should complete loading.");
- return resource.requestContent();
- })
- .then((resource) => {
- InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");
- })
- .then(resolve, reject);
-
- InspectorTest.evaluateInPage("createJSONXHR()");
+ resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFinish, (event) => {
+ InspectorTest.pass("Resource should complete loading.");
+ resource.requestContent().then(() => {
+ InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");
+ }).then(resolve, reject);
+ });
+ });
}
});
@@ -50,25 +43,18 @@
suite.addTestCase({
name: "XHR.JSONContent.Blob",
description: "Ensure an XMLHttpRequest with JSON content and a responseType of blob still gives us text.",
- test(resolve, reject) {
- let resource = null;
-
- WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded)
- .then((event) => {
- resource = event.data.resource;
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createJSONBlobXHR()");
+ WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
+ let resource = event.data.resource;
InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
- return resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFinish);
- })
- .then((event) => {
- InspectorTest.pass("Resource should complete loading.");
- return resource.requestContent();
- })
- .then((resource) => {
- InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");
- })
- .then(resolve, reject);
-
- InspectorTest.evaluateInPage("createJSONBlobXHR()");
+ resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFinish, (event) => {
+ InspectorTest.pass("Resource should complete loading.");
+ resource.requestContent().then(() => {
+ InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");
+ }).then(resolve, reject);
+ });
+ });
}
});
