Bug 1408949 - Always clear splitconsole height pref after each test;r=Honza draft
authorBrian Grinstead <bgrinstead@mozilla.com>
Fri, 01 Dec 2017 10:36:25 -0800
changeset 706410 8feee641b738331f0f58694fb809a25949dd1802
parent 706409 70788abbfc86a5838626fb5f1f17d03537c2830c
child 742643 e7d2b3220e75d32d0a86cdfe034f6ce93c5c3824
push id91787
push userbgrinstead@mozilla.com
push dateFri, 01 Dec 2017 20:58:01 +0000
reviewersHonza
bugs1408949
milestone59.0a1
Bug 1408949 - Always clear splitconsole height pref after each test;r=Honza MozReview-Commit-ID: 8BxwRp19U9l
devtools/client/framework/test/shared-head.js
devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_focus.js
devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_persist.js
devtools/client/webconsole/test/browser_webconsole_split_persist.js
--- a/devtools/client/framework/test/shared-head.js
+++ b/devtools/client/framework/test/shared-head.js
@@ -113,16 +113,17 @@ function getFrameScript() {
 
 flags.testing = true;
 registerCleanupFunction(() => {
   flags.testing = false;
   Services.prefs.clearUserPref("devtools.dump.emit");
   Services.prefs.clearUserPref("devtools.toolbox.host");
   Services.prefs.clearUserPref("devtools.toolbox.previousHost");
   Services.prefs.clearUserPref("devtools.toolbox.splitconsoleEnabled");
+  Services.prefs.clearUserPref("devtools.toolbox.splitconsoleHeight");
 });
 
 registerCleanupFunction(function* cleanup() {
   while (gBrowser.tabs.length > 1) {
     yield closeTabAndToolbox(gBrowser.selectedTab);
   }
 });
 
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_focus.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_focus.js
@@ -54,12 +54,11 @@
     while (activeElement && activeElement.contentDocument) {
       activeElement = activeElement.contentDocument.activeElement;
     }
     return activeElement;
   }
 
   function finish() {
     toolbox = TEST_URI = null;
-    Services.prefs.clearUserPref("devtools.toolbox.splitconsoleHeight");
     finishTest();
   }
 }
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_persist.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_persist.js
@@ -107,12 +107,11 @@
     let contentWindow = toolbox.win;
     contentWindow.focus();
     EventUtils.sendKey("ESCAPE", contentWindow);
     return onceSplitConsole;
   }
 
   function finish() {
     toolbox = TEST_URI = null;
-    Services.prefs.clearUserPref("devtools.toolbox.splitconsoleHeight");
     finishTest();
   }
 }
--- a/devtools/client/webconsole/test/browser_webconsole_split_persist.js
+++ b/devtools/client/webconsole/test/browser_webconsole_split_persist.js
@@ -107,12 +107,11 @@
     let contentWindow = toolbox.win;
     contentWindow.focus();
     EventUtils.sendKey("ESCAPE", contentWindow);
     return onceSplitConsole;
   }
 
   function finish() {
     toolbox = TEST_URI = null;
-    Services.prefs.clearUserPref("devtools.toolbox.splitconsoleHeight");
     finishTest();
   }
 }