Backed out changeset ba8a1b53973c (bug 1109388) for m-oth test failures

mozilla-spidermonkey · Feb 2, 2015 · efce46b · efce46b
1 parent 0ae8ed2
commit efce46b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 27 deletions.
diff --git a/browser/devtools/webide/content/webide.xul b/browser/devtools/webide/content/webide.xul
@@ -196,11 +196,11 @@
       <iframe id="deck-panel-projecteditor" flex="1"/>
       <iframe id="deck-panel-addons" flex="1" src="addons.xhtml"/>
       <iframe id="deck-panel-prefs" flex="1" src="prefs.xhtml"/>
-      <iframe id="deck-panel-permissionstable" flex="1" lazysrc="permissionstable.xhtml"/>
-      <iframe id="deck-panel-runtimedetails" flex="1" lazysrc="runtimedetails.xhtml"/>
+      <iframe id="deck-panel-permissionstable" flex="1" src="permissionstable.xhtml"/>
+      <iframe id="deck-panel-runtimedetails" flex="1" src="runtimedetails.xhtml"/>
       <iframe id="deck-panel-monitor" flex="1" lazysrc="monitor.xhtml"/>
-      <iframe id="deck-panel-devicepreferences" flex="1" lazysrc="devicepreferences.xhtml"/>
-      <iframe id="deck-panel-devicesettings" flex="1" lazysrc="devicesettings.xhtml"/>
+      <iframe id="deck-panel-devicepreferences" flex="1" src="devicepreferences.xhtml"/>
+      <iframe id="deck-panel-devicesettings" flex="1" src="devicesettings.xhtml"/>
     </deck>
     <splitter hidden="true" class="devtools-horizontal-splitter" orient="vertical"/>
     <!-- toolbox iframe will be inserted here -->

diff --git a/browser/devtools/webide/test/test_device_preferences.html b/browser/devtools/webide/test/test_device_preferences.html
@@ -30,10 +30,14 @@
 
           let prefIframe = win.document.querySelector("#deck-panel-devicepreferences");
 
+          yield documentIsLoaded(prefIframe.contentWindow.document);
+
           win.AppManager.update("runtimelist");
 
           yield connectToLocalRuntime(win);
 
+          yield nextTick();
+
           let prefs = win.document.querySelector("#cmd_showDevicePrefs");
 
           ok(!prefs.hasAttribute("disabled"), "device prefs cmd enabled");
@@ -43,13 +47,8 @@
           win.Cmds.showDevicePrefs();
           is(deck.selectedPanel, prefIframe, "device preferences iframe selected");
 
-          yield nextTick();
-
-          yield documentIsLoaded(prefIframe.contentWindow.document);
-
-          yield nextTick();
-
           yield prefIframe.contentWindow.getAllPrefs;
+          yield nextTick();
 
           setDocument(prefIframe);
 

diff --git a/browser/devtools/webide/test/test_device_settings.html b/browser/devtools/webide/test/test_device_settings.html
@@ -34,10 +34,14 @@
 
           let settingIframe = win.document.querySelector("#deck-panel-devicesettings");
 
+          yield documentIsLoaded(settingIframe.contentWindow.document);
+
           win.AppManager.update("runtimelist");
 
           yield connectToLocalRuntime(win);
 
+          yield nextTick();
+
           let settings = win.document.querySelector("#cmd_showSettings");
 
           ok(!settings.hasAttribute("disabled"), "device settings cmd enabled");
@@ -47,13 +51,8 @@
           win.Cmds.showSettings();
           is(deck.selectedPanel, settingIframe, "device settings iframe selected");
 
-          yield nextTick();
-
-          yield documentIsLoaded(settingIframe.contentWindow.document);
-
-          yield nextTick();
-
           yield settingIframe.contentWindow.getAllSettings;
+          yield nextTick();
 
           setDocument(settingIframe);
 

diff --git a/browser/devtools/webide/test/test_deviceinfo.html b/browser/devtools/webide/test/test_deviceinfo.html
@@ -31,6 +31,9 @@
           let permIframe = win.document.querySelector("#deck-panel-permissionstable");
           let infoIframe = win.document.querySelector("#deck-panel-runtimedetails");
 
+          yield documentIsLoaded(permIframe.contentWindow.document);
+          yield documentIsLoaded(infoIframe.contentWindow.document);
+
           yield connectToLocalRuntime(win);
 
           yield nextTick();
@@ -46,14 +49,10 @@
           win.Cmds.showRuntimeDetails();
           is(deck.selectedPanel, infoIframe, "info iframe selected");
 
-          yield nextTick();
-
-          yield documentIsLoaded(infoIframe.contentWindow.document);
+          yield infoIframe.contentWindow.getDescriptionPromise;
 
           yield nextTick();
 
-          yield infoIframe.contentWindow.getDescriptionPromise;
-
           // device info and permissions content is checked in other tests
           // We just test one value to make sure we get something
 
@@ -73,12 +72,6 @@
           win.Cmds.showPermissionsTable();
           is(deck.selectedPanel, permIframe, "permission iframe selected");
 
-          yield nextTick();
-
-          yield documentIsLoaded(permIframe.contentWindow.document);
-
-          yield nextTick();
-
           yield permIframe.contentWindow.getRawPermissionsTablePromise;
 
           yield nextTick();