From 8033908b2da92463b2a8b356673f406aa54f3c0a Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Tue, 26 Apr 2022 18:21:35 +0000
Subject: [PATCH] Bug 1751259 - make marionette really use fission.
 r=whimboo,webdriver-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D144342
---
 .../sessionstore/test/marionette/manifest.ini |  2 +-
 .../harness/marionette_harness/runner/base.py | 22 -------------------
 .../tests/unit/unit-tests.ini                 |  4 +++-
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/browser/components/sessionstore/test/marionette/manifest.ini b/browser/components/sessionstore/test/marionette/manifest.ini
index 2577526303a0..452173853a76 100644
--- a/browser/components/sessionstore/test/marionette/manifest.ini
+++ b/browser/components/sessionstore/test/marionette/manifest.ini
@@ -5,4 +5,4 @@ tags = local
 [test_restore_windows_after_windows_shutdown.py]
 skip-if =
   os != "win"
-  win10_2004 && !debug && !asan # Bug 1727691
+  win10_2004  # Bug 1727691
diff --git a/testing/marionette/harness/marionette_harness/runner/base.py b/testing/marionette/harness/marionette_harness/runner/base.py
index 114d0d0b573a..e5dcaf7758a1 100644
--- a/testing/marionette/harness/marionette_harness/runner/base.py
+++ b/testing/marionette/harness/marionette_harness/runner/base.py
@@ -421,13 +421,6 @@ class BaseMarionetteArguments(ArgumentParser):
             help="Enable python post-mortem debugger when a test fails."
             " Pass in the debugger you want to use, eg pdb or ipdb.",
         )
-        self.add_argument(
-            "--enable-fission",
-            action="store_true",
-            dest="enable_fission",
-            default=False,
-            help="Enable Fission (site isolation) in Gecko.",
-        )
         self.add_argument(
             "-z",
             "--headless",
@@ -643,7 +636,6 @@ class BaseMarionetteTestRunner(object):
         verbose=0,
         emulator=False,
         headless=False,
-        enable_fission=False,
         **kwargs
     ):
         self._appName = None
@@ -688,20 +680,6 @@ class BaseMarionetteTestRunner(object):
         self.verbose = verbose
         self.headless = headless
 
-        self.enable_fission = enable_fission
-        if self.enable_fission:
-            self.prefs.update(
-                {
-                    "fission.autostart": True,
-                }
-            )
-        else:
-            self.prefs.update(
-                {
-                    "fission.autostart": False,
-                }
-            )
-
         # If no repeat has been set, default to 30 extra runs
         if self.run_until_failure and repeat is None:
             self.repeat = 30
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini b/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
index 98f512a23ced..ffa19ff9bc12 100644
--- a/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
+++ b/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
@@ -102,7 +102,9 @@ skip-if = asan || manage_instance == false
 [test_localization.py]
 
 [test_reftest.py]
-skip-if = os == 'mac' # bug 1674411
+skip-if =
+  os == 'mac' # bug 1674411
+  os == "linux" && asan && fission  # bug 1727207
 
 [test_sendkeys_menupopup_chrome.py]