Backed out changeset d04a9bf0df24 (bug 1052371)

build/automationutils.py

@@ -606,8 +606,6 @@ class ShutdownLeaks(object):
           self._logWindow(line)
         elif line[2:10] == "DOCSHELL":
           self._logDocShell(line)
-        elif line.startswith("TEST-START | Shutdown"):
-          self.seenShutdown = True
     elif message['action'] == 'test_start':
       fileName = message['test'].replace("chrome://mochitests/content/browser/", "")
       self.currentTest = {"fileName": fileName, "windows": set(), "docShells": set()}
@@ -616,11 +614,10 @@ class ShutdownLeaks(object):
       if self.currentTest and (self.currentTest["windows"] or self.currentTest["docShells"]):
         self.tests.append(self.currentTest)
       self.currentTest = None
+    elif message['action'] == 'suite_end':
+      self.seenShutdown = True
 
   def process(self):
-    if not self.seenShutdown:
-      self.logger("TEST-UNEXPECTED-FAIL | ShutdownLeaks | process() called before end of test suite")
-
     for test in self._parseLeakingTests():
       for url, count in self._zipLeakedWindows(test["leakedWindows"]):
         self.logger("TEST-UNEXPECTED-FAIL | %s | leaked %d window(s) until shutdown [url = %s]" % (test["fileName"], count, url))

testing/mochitest/runtests.py

@@ -1332,7 +1332,7 @@ class Mochitest(MochitestUtilsMixin):
              symbolsPath=None,
              timeout=-1,
              onLaunch=None,
-             detectShutdownLeaks=False,
+             webapprtChrome=False,
              screenshotOnFail=False,
              testPath=None,
              bisectChunk=None,
@@ -1383,7 +1383,7 @@ class Mochitest(MochitestUtilsMixin):
           testUrl = testUrl.replace("&", "\\&")
         args.append(testUrl)
 
-      if detectShutdownLeaks:
+      if mozinfo.info["debug"] and not webapprtChrome:
         shutdownLeaks = ShutdownLeaks(log.info)
       else:
         shutdownLeaks = None
@@ -1743,9 +1743,6 @@ class Mochitest(MochitestUtilsMixin):
       if options.vmwareRecording:
         self.startVMwareRecording(options);
 
-      # detect shutdown leaks for m-bc runs
-      detectShutdownLeaks = mozinfo.info["debug"] and options.browserChrome and not options.webapprtChrome
-
       log.info("runtests.py | Running tests: start.\n")
       try:
         status = self.runApp(testURL,
@@ -1758,7 +1755,7 @@ class Mochitest(MochitestUtilsMixin):
                              symbolsPath=options.symbolsPath,
                              timeout=timeout,
                              onLaunch=onLaunch,
-                             detectShutdownLeaks=detectShutdownLeaks,
+                             webapprtChrome=options.webapprtChrome,
                              screenshotOnFail=options.screenshotOnFail,
                              testPath=options.testPath,
                              bisectChunk=options.bisectChunk,