Changeset 254145 in webkit

Timestamp:

Jan 7, 2020, 12:17:41 PM (6 years ago)

Author:

Devin Rousso

Message:

REGRESSION: [ Mac Debug ] inspector/page/setBootstrapScript-main-frame.html is a flaky failure
​https://bugs.webkit.org/show_bug.cgi?id=205807
<rdar://problem/58344669>

Reviewed by Dean Jackson.

Source/WebInspectorUI:

• UserInterface/Controllers/NetworkManager.js:

(WI.NetworkManager.prototype.async createBootstrapScript):
(WI.NetworkManager.prototype._handleBootstrapScriptContentDidChange):
Ensure that Page.setBootstrapScript is called when restoring the bootstrap script from the
IndexedDB storage. Otherwise, in situations like when Web Inspector is first opened, we will
show the Inspector Bootstrap Script in the UI, but not actually set it on the inspected page.

LayoutTests:

• inspector/page/setBootstrapScript-main-frame.html:

In addition to waiting for Page.reload, we should also wait for the page to actually load.
Set the content of the bootstrap script during its creation instead of as a two step process.
Avoid an assertion by setting the enabled state after the bootstrap script is initalized.

• platform/mac/TestExpectations:

Remove expectation added in r254059.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/page/setBootstrapScript-main-frame.html (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-01-07  Devin Rousso  <drousso@apple.com>
+
+        REGRESSION: [ Mac Debug ] inspector/page/setBootstrapScript-main-frame.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=205807
+        <rdar://problem/58344669>
+
+        Reviewed by Dean Jackson.
+
+        * inspector/page/setBootstrapScript-main-frame.html:
+        In addition to waiting for `Page.reload`, we should also wait for the page to actually load.
+        Set the content of the bootstrap script during its creation instead of as a two step process.
+        Avoid an assertion by setting the enabled state after the bootstrap script is initalized.
+
+        * platform/mac/TestExpectations:
+        Remove expectation added in r254059.
+
 2020-01-07  Truitt Savell  <tsavell@apple.com>
 

trunk/LayoutTests/inspector/page/setBootstrapScript-main-frame.html

@@ -12 +12 @@
         description: "Test that the bootstrap script is executed in the main frame.",
         async test() {
+            InspectorTest.assert(!WI.networkManager.bootstrapScript, "Should not already have a bootstrap script.");
+
             let valueBeforeBootstrapScript = await InspectorTest.evaluateInPage(`window.valueFromBootstrapScript`);
             InspectorTest.expectEqual(valueBeforeBootstrapScript, undefined, "'valueFromBootstrapScript' should be 'undefined'.");
 
             InspectorTest.log("Setting bootstrap script...");
-            await WI.networkManager.createBootstrapScript();
+            await WI.networkManager.createBootstrapScript(`window.valueFromBootstrapScript = 42;`);
             WI.networkManager.bootstrapScriptEnabled = true;
-            WI.networkManager.bootstrapScript.currentRevision.updateRevisionContent(`window.valueFromBootstrapScript = 42;`);
 
             InspectorTest.log("Reloading page...");
-            await InspectorTest.reloadPage();
-
-            await Promise.delay(10);
+            await Promise.all([
+                InspectorTest.awaitEvent(FrontendTestHarness.Event.TestPageDidLoad),
+                InspectorTest.reloadPage(),
+            ]);
 
             let valueAfterBootstrapScript = await InspectorTest.evaluateInPage(`window.valueFromBootstrapScript`);

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1964 +1964 @@
 webkit.org/b/205756 webgl/2.0.0/conformance2/glsl3/no-attribute-vertex-shader.html [ Pass Failure ]
 
-webkit.org/b/205807 [ Debug ] inspector/page/setBootstrapScript-main-frame.html [ Pass Failure ]
-
 webkit.org/b/205862 [ Mojave+ ] webgpu/whlsl/while-loop-break.html [ Pass ImageOnlyFailure ]
 webkit.org/b/205865 [ Mojave+ ] webgpu/whlsl/ensure-proper-variable-lifetime-2.html [ Pass ImageOnlyFailure ]

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-01-07  Devin Rousso  <drousso@apple.com>
+
+        REGRESSION: [ Mac Debug ] inspector/page/setBootstrapScript-main-frame.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=205807
+        <rdar://problem/58344669>
+
+        Reviewed by Dean Jackson.
+
+        * UserInterface/Controllers/NetworkManager.js:
+        (WI.NetworkManager.prototype.async createBootstrapScript):
+        (WI.NetworkManager.prototype._handleBootstrapScriptContentDidChange):
+        Ensure that `Page.setBootstrapScript` is called when restoring the bootstrap script from the
+        IndexedDB storage. Otherwise, in situations like when Web Inspector is first opened, we will
+        show the Inspector Bootstrap Script in the UI, but not actually set it on the inspected page.
+
 2020-01-06  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js

@@ -325 +325 @@
         this._bootstrapScript = new WI.LocalScript(target, url, sourceURL, WI.Script.SourceType.Program, source, {injected: true, editable: true});
         this._bootstrapScript.addEventListener(WI.SourceCode.Event.ContentDidChange, this._handleBootstrapScriptContentDidChange, this);
-
-        if (!this._bootstrapScript.content)
-            WI.objectStores.general.put("", NetworkManager.bootstrapScriptSourceObjectStoreKey);
+        this._handleBootstrapScriptContentDidChange();
 
         this.dispatchEventToListeners(NetworkManager.Event.BootstrapScriptCreated, {bootstrapScript: this._bootstrapScript});
@@ -1432 +1430 @@
     _handleBootstrapScriptContentDidChange(event)
     {
-        let source = this._bootstrapScript.content;
+        let source = this._bootstrapScript.content || "";
 
         WI.objectStores.general.put(source, NetworkManager.bootstrapScriptSourceObjectStoreKey);