Merge mozilla-central to autoland on a CLOSED TREE

mozilla-spidermonkey · Dec 4, 2019 · ecb4d05 · ecb4d05
2 parents c1e6d47 + 3623ac0
commit ecb4d05
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/testing/talos/talos/test.py b/testing/talos/talos/test.py
@@ -130,20 +130,6 @@ class TsBase(Test):
                          # more recent copy).
     ]
 
-    def __init__(self, **kw):
-        super(TsBase, self).__init__(**kw)
-
-        # Unless set to False explicitly, all TsBase tests will have the blocklist
-        # enabled by default in order to more accurately test the startup paths.
-        BLOCKLIST_PREF = "extensions.blocklist.enabled"
-
-        if not hasattr(self, "preferences"):
-            self.preferences = {
-              BLOCKLIST_PREF: True,
-            }
-        elif BLOCKLIST_PREF not in self.preferences:
-            self.preferences[BLOCKLIST_PREF] = True
-
 
 @register_test()
 class ts_paint(TsBase):