Changeset 206263 in webkit

Timestamp:

Sep 22, 2016 11:19:49 AM (8 years ago)

Author:

Ryan Haddad

Message:

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

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/network/client-blocked-load-expected.txt (modified) (1 diff)
• inspector/network/client-blocked-load.html (modified) (1 diff)
• inspector/network/xhr-json-blob-has-content.html (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-22  Ryan Haddad  <ryanhaddad@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  <youenn@apple.com>
 

trunk/LayoutTests/inspector/network/client-blocked-load-expected.txt

@@ -5 +5 @@
 -- 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.
 

trunk/LayoutTests/inspector/network/client-blocked-load.html

@@ -19 +19 @@
         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();
+                });
+            });
         }
     });

trunk/LayoutTests/inspector/network/xhr-json-blob-has-content.html

@@ -26 +26 @@
         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);
+                });
+            });
         }
     });
@@ -51 +44 @@
         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);
+                });
+            });
         }
     });