Bug 1916662 - Enable marionette tests for tsan builds. r=whimboo,webdriver-reviewers,releng-reviewers,bhearsum,jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D225148

taskcluster/kinds/test/marionette.yml

@@ -36,7 +36,7 @@ task-defaults:
                     default: []
             default:
                 by-test-platform:
-                    .*(tsan|wayland).*: []
+                    .*(wayland).*: []
                     default: built-projects
     virtualization: virtual
 
@@ -46,6 +46,7 @@ marionette-unittest:
     max-run-time:
         by-test-platform:
             .*asan.*: 3600
+            .*tsan.*: 4500
             default: 1800
     instance-size: default
     chunks: 1
@@ -62,6 +63,7 @@ marionette:
     max-run-time:
         by-test-platform:
             .*asan.*: 3600
+            .*tsan.*: 3600
             .*ccov.*: 3600
             .*debug.*: 3600
             default: 2700
@@ -69,4 +71,5 @@ marionette:
     chunks:
         by-test-platform:
             .*asan.*: 2
+            .*tsan.*: 2
             default: 1

testing/marionette/harness/marionette_harness/tests/unit/test_quit_restart.py

@@ -6,6 +6,8 @@ import sys
 import unittest
 from urllib.parse import quote
 
+import mozinfo
+
 from marionette_driver import errors
 from marionette_driver.by import By
 from marionette_harness import MarionetteTestCase
@@ -195,6 +197,10 @@ class TestQuitRestart(MarionetteTestCase):
         self.marionette.restart(in_app=False)
         self.assertEqual(self.marionette.session.get("test:fooBar"), True)
 
+    @unittest.skipIf(
+        mozinfo.info["tsan"] == True,
+        "Bug 1925308 - socket.timeout: Process unexpectedly quit without restarting",
+    )
     def test_restart_safe_mode(self):
         try:
             self.assertFalse(self.is_safe_mode, "Safe Mode is unexpectedly enabled")