From afaddd8817b311fafaf06bde34635b2d6c2b5911 Mon Sep 17 00:00:00 2001
From: Julian Descottes <julian.descottes@gmail.com>
Date: Wed, 17 Jan 2018 19:40:03 +0100
Subject: [PATCH] Use pushPref helper in mochitests to set temporary pref
 values

---
 src/test/mochitest/browser_dbg-async-stepping.js |  9 +--------
 src/test/mochitest/browser_dbg-chrome-create.js  |  3 +--
 src/test/mochitest/browser_dbg-minified.js       |  2 +-
 src/test/mochitest/browser_dbg-search-project.js | 12 +-----------
 src/test/mochitest/browser_dbg-sourcemaps3.js    |  2 +-
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/test/mochitest/browser_dbg-async-stepping.js b/src/test/mochitest/browser_dbg-async-stepping.js
index 1f6e5b5f97..d0ed54c6df 100644
--- a/src/test/mochitest/browser_dbg-async-stepping.js
+++ b/src/test/mochitest/browser_dbg-async-stepping.js
@@ -3,7 +3,7 @@
 
 // Tests async stepping will step over await statements
 add_task(async function test() {
-  Services.prefs.setBoolPref("devtools.debugger.features.async-stepping", true);
+  await pushPref("devtools.debugger.features.async-stepping", true);
   const dbg = await initDebugger("doc-async.html", "async");
 
   await selectSource(dbg, "async");
@@ -18,10 +18,3 @@ add_task(async function test() {
   assertPausedLocation(dbg);
   assertDebugLine(dbg, 9);
 });
-
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref(
-    "devtools.debugger.features.async-stepping",
-    false
-  );
-});
diff --git a/src/test/mochitest/browser_dbg-chrome-create.js b/src/test/mochitest/browser_dbg-chrome-create.js
index 9499108ba3..f5c69214d4 100644
--- a/src/test/mochitest/browser_dbg-chrome-create.js
+++ b/src/test/mochitest/browser_dbg-chrome-create.js
@@ -38,14 +38,13 @@ function onClose() {
 }
 
 registerCleanupFunction(function() {
-  Services.prefs.clearUserPref("devtools.debugger.remote-enabled");
   gProcess = null;
 });
 
 add_task(async function() {
   // Windows XP and 8.1 test slaves are terribly slow at this test.
   requestLongerTimeout(5);
-  Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
+  await pushPref("devtools.debugger.remote-enabled", true);
 
   gProcess = await initChromeDebugger();
 
diff --git a/src/test/mochitest/browser_dbg-minified.js b/src/test/mochitest/browser_dbg-minified.js
index cfb7fb81c6..946a85d00f 100644
--- a/src/test/mochitest/browser_dbg-minified.js
+++ b/src/test/mochitest/browser_dbg-minified.js
@@ -16,7 +16,7 @@ function getScopeNodeValue(dbg, index) {
 }
 
 add_task(async function() {
-  Services.prefs.setBoolPref("devtools.debugger.features.map-scopes", true);
+  await pushPref("devtools.debugger.features.map-scopes", true);
 
   const dbg = await initDebugger("doc-minified2.html");
 
diff --git a/src/test/mochitest/browser_dbg-search-project.js b/src/test/mochitest/browser_dbg-search-project.js
index 4aeafb057b..1823329c71 100644
--- a/src/test/mochitest/browser_dbg-search-project.js
+++ b/src/test/mochitest/browser_dbg-search-project.js
@@ -35,10 +35,7 @@ function getResultsCount(dbg) {
 
 // Testing project search
 add_task(async function() {
-  Services.prefs.setBoolPref(
-    "devtools.debugger.project-text-search-enabled",
-    true
-  );
+  await pushPref("devtools.debugger.project-text-search-enabled", true);
 
   const dbg = await initDebugger("doc-script-switching.html", "switching-01");
 
@@ -61,10 +58,3 @@ add_task(async function() {
   const selectedSource = dbg.selectors.getSelectedSource(dbg.getState());
   ok(selectedSource.get("url").includes("switching-01"));
 });
-
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref(
-    "devtools.debugger.project-text-search-enabled",
-    false
-  );
-});
diff --git a/src/test/mochitest/browser_dbg-sourcemaps3.js b/src/test/mochitest/browser_dbg-sourcemaps3.js
index 2b617448bb..27abc9359b 100644
--- a/src/test/mochitest/browser_dbg-sourcemaps3.js
+++ b/src/test/mochitest/browser_dbg-sourcemaps3.js
@@ -25,7 +25,7 @@ async function waitForScopeNode(dbg, index) {
 add_task(async function() {
   // NOTE: the CORS call makes the test run times inconsistent
   requestLongerTimeout(2);
-  Services.prefs.setBoolPref("devtools.debugger.features.map-scopes", true);
+  await pushPref("devtools.debugger.features.map-scopes", true);
 
   const dbg = await initDebugger("doc-sourcemaps3.html");
   const { selectors: { getBreakpoint, getBreakpoints }, getState } = dbg;