Backed out changeset 776dc76ec598 (bug 1567122) for landing without proper peer review on a CLOSED TREE

taskcluster/ci/config.yml

@@ -74,7 +74,6 @@ treeherder:
         'tt': 'Telemetry tests'
         'tt-1proc': 'Telemetry tests without e10s'
         'SY': 'Are we slim yet tests by TaskCluster'
-        'SY-fis': 'Are we slim yet tests by TaskCluster, fission enabled'
         'SYsd': 'Are we slim yet tests by TaskCluster, Stylo disabled'
         'SYss': 'Are we slim yet tests by TaskCluster, Stylo sequential'
         'VP': 'VideoPuppeteer tests'

taskcluster/ci/test/awsy.yml

@@ -38,7 +38,6 @@ awsy:
 
 awsy-tp6:
     description: "Are we slim yet - tp6 pageset"
-    variants: ["fission"]
     treeherder-symbol: SY(sy-tp6)
     run-on-projects:
         by-test-platform:
@@ -49,7 +48,6 @@ awsy-tp6:
     mozharness:
         extra-options:
             - --tp6
-            - --enable-fission
 
 awsy-dmd:
     description: "Are we slim yet - dmd enabled"

testing/awsy/awsy/test_memory_usage.py

@@ -87,11 +87,7 @@ class TestMemoryUsage(AwsyTestCase):
         self._urls = urls
 
         # Indicate that we're using tp6 in the perf data.
-        # ENABLE_FISSION is accessed through inheritance:
-        # MarionetteTestCase :: AwsyTestCase :: TestMemoryUsage
         self._extra_opts = ["tp6"]
-        if TestMemoryUsage.ENABLE_FISSION:
-            self._extra_opts.append("fission-enabled")
 
         # Now we setup the mitm proxy with our tp6 pageset.
         tp6_pageset_manifest = os.path.join(AWSY_PATH, 'tp6-pageset.manifest')

testing/awsy/mach_commands.py

@@ -75,7 +75,7 @@ class MachCommands(MachCommandBase):
 
         runtime_testvars = {}
         for arg in ('webRootDir', 'pageManifest', 'resultsDir', 'entities', 'iterations',
-                    'perTabPause', 'settleWaitTime', 'maxTabs', 'dmd', 'tp6', 'enable_fission'):
+                    'perTabPause', 'settleWaitTime', 'maxTabs', 'dmd', 'tp6'):
             if arg in kwargs and kwargs[arg] is not None:
                 runtime_testvars[arg] = kwargs[arg]
 
@@ -238,9 +238,6 @@ class MachCommands(MachCommandBase):
     @CommandArgument('--tp6', group='AWSY', action='store_true',
                      dest='tp6', default=False,
                      help='Use the tp6 pageset during testing.')
-    @CommandArgument('--enable-fission', group='AWSY', action='store_true',
-                     dest='enable_fission', default=False,
-                     help='Enable Fission (site isolation) in Gecko.')
     def run_awsy_test(self, tests, **kwargs):
         """mach awsy-test runs the in-tree version of the Are We Slim Yet
         (AWSY) tests.

testing/marionette/harness/marionette_harness/marionette_test/testcases.py

@@ -286,7 +286,6 @@ class CommonTestCase(unittest.TestCase):
 class MarionetteTestCase(CommonTestCase):
 
     match_re = re.compile(r"test_(.*)\.py$")
-    ENABLE_FISSION = False
 
     def __init__(self, marionette_weakref, fixtures, methodName='runTest',
                  filepath='', **kwargs):
@@ -296,18 +295,6 @@ class MarionetteTestCase(CommonTestCase):
         super(MarionetteTestCase, self).__init__(
             methodName, marionette_weakref=marionette_weakref, fixtures=fixtures, **kwargs)
 
-        fission_in_flags = kwargs.get('enable_fission', False)
-        fission_in_prefs_args = False
-        if (kwargs.get('prefs_args') is not None) and \
-                ('fission.autostart=true' in kwargs.get('prefs_args') or
-                 '"fission.autostart=true"' in kwargs.get('prefs_args')):
-            fission_in_prefs_args = True
-
-        # For 'mach awsy-test --tp6' fission is enabled through:
-        # "--enable-fission" flag on local runs
-        # or "prefs_args" on treeherder
-        MarionetteTestCase.ENABLE_FISSION = fission_in_flags or fission_in_prefs_args
-
     @classmethod
     def add_tests_to_suite(cls, mod_name, filepath, suite, testloader, marionette,
                            fixtures, testvars, **kwargs):

testing/mozharness/scripts/awsy_script.py

@@ -79,13 +79,7 @@ class AWSY(TestingMixin, MercurialScript, TooltoolMixin, CodeCoverageMixin):
           "dest": "tp6",
           "default": False,
           "help": "Runs tests with the tp6 pageset.",
-          }],
-        [["--enable-fission"],
-         {"action": "store_true",
-          "dest": "enable_fission",
-          "default": False,
-          "help": "Enable Fission (site isolation) in Gecko.",
-          }],
+          }]
 
     ] + testing_config_options + copy.deepcopy(code_coverage_config_options)