Bug 1414962 - Increase timeout for xpcshell selftest in code coverage builds. r=jmaher
authorMarco Castelluccio <mcastelluccio@mozilla.com>
Thu, 09 Nov 2017 11:33:31 +0100
changeset 444301 fc457cd0871553d94e3e46f089c0a8f030d6595d
parent 444300 15b89e515c94cb05bfdebdf7fc37a347234547c8
child 444302 749ec70a3d406222cb3e7c4ac4ddcdd9379b286c
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1414962
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1414962 - Increase timeout for xpcshell selftest in code coverage builds. r=jmaher
testing/xpcshell/selftest.py
--- a/testing/xpcshell/selftest.py
+++ b/testing/xpcshell/selftest.py
@@ -458,17 +458,17 @@ class XPCShellTestsTests(unittest.TestCa
     def setUp(self):
         self.log = StringIO()
         self.tempdir = tempfile.mkdtemp()
         self.utility_path = os.path.join(objdir, 'dist', 'bin')
         logger = structured.commandline.setup_logging("selftest%s" % id(self),
                                                       {},
                                                       {"tbpl": self.log})
         self.x = XPCShellTests(logger)
-        self.x.harness_timeout = 15
+        self.x.harness_timeout = 15 if not mozinfo.info["ccov"] else 60
         self.symbols_path = None
         candidate_path = os.path.join(build_obj.distdir, 'crashreporter-symbols')
         if (os.path.isdir(candidate_path)):
             self.symbols_path = candidate_path
 
     def tearDown(self):
         shutil.rmtree(self.tempdir)