From 426d07f236b135a840a2fa1c8ffbff58e7b5706a Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Tue, 23 Jun 2020 13:26:06 +0000
Subject: [PATCH] Bug 1646636 - Disable devtools.contenttoolbox.fission in
 inspector tests for frames + context menu
 r=ochameau,perftest-reviewers,sparky

Differential Revision: https://phabricator.services.mozilla.com/D80503
---
 .../test/browser_inspector_inspect_node_contextmenu.js   | 9 +++++----
 .../devtools/addon/content/tests/inspector/custom.js     | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/devtools/client/inspector/test/browser_inspector_inspect_node_contextmenu.js b/devtools/client/inspector/test/browser_inspector_inspect_node_contextmenu.js
index 868d301bd4ec..777f0cc23403 100644
--- a/devtools/client/inspector/test/browser_inspector_inspect_node_contextmenu.js
+++ b/devtools/client/inspector/test/browser_inspector_inspect_node_contextmenu.js
@@ -19,10 +19,11 @@ const HTML = `
 const TEST_URI = "data:text/html;charset=utf-8," + encodeURI(HTML);
 
 add_task(async function() {
-  Services.prefs.setBoolPref("devtools.command-button-frames.enabled", true);
-  registerCleanupFunction(() => {
-    Services.prefs.clearUserPref("devtools.command-button-frames.enabled");
-  });
+  await pushPref("devtools.command-button-frames.enabled", true);
+
+  // Nested same-process iframes are broken with Fission +
+  // contenttoolbox.fission. See Bug 1647366.
+  await pushPref("devtools.contenttoolbox.fission", false);
 
   const tab = await addTab(TEST_URI);
   const testActor = await getTestActorWithoutToolbox(tab);
diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/custom.js b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/custom.js
index 08de98f4408c..6c6e7f7c3a6f 100644
--- a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/custom.js
+++ b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/custom.js
@@ -4,6 +4,7 @@
 
 "use strict";
 
+const Services = require("Services");
 const {
   reloadInspectorAndLog,
   selectNodeFront,
@@ -23,6 +24,10 @@ const { gDevTools } = require("devtools/client/framework/devtools");
 const TEST_URL = PAGES_BASE_URL + "custom/inspector/index.html";
 
 module.exports = async function() {
+  // Nested same-process iframes are broken with Fission +
+  // contenttoolbox.fission. See Bug 1647366.
+  Services.prefs.setBoolPref("devtools.contenttoolbox.fission", false);
+
   const tab = await testSetup(TEST_URL, { disableCache: true });
 
   const domReference = await getContentDOMReference("#initial-node", tab);
@@ -43,6 +48,7 @@ module.exports = async function() {
   await new Promise(r => setTimeout(r, 1000));
   await garbageCollect();
 
+  Services.prefs.clearUserPref("devtools.contenttoolbox.fission");
   await testTeardown();
 };