Backed out changeset c7a2f3e14a58 - Testing from bug 535564 - We don't have a file handle open when we launch ssltunnel, so ssltunnel wasn't the cause.
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 27 Jan 2010 13:17:06 -0500
changeset 46623 686aedb56727e992700c4cb6dcc0162dab5b895b
parent 46585 c7a2f3e14a580c7708cd0062b0ddc76e2eaaf322
child 46625 c04a2911a953c72a2a925d65554da9c5c7a32439
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs535564
milestone1.9.3a1pre
backs outc7a2f3e14a580c7708cd0062b0ddc76e2eaaf322
Backed out changeset c7a2f3e14a58 - Testing from bug 535564 - We don't have a file handle open when we launch ssltunnel, so ssltunnel wasn't the cause.
build/automation.py.in
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -732,15 +732,15 @@ user_pref("camino.use_system_proxy_setti
 
     status = self.waitForFinish(proc, utilityPath, timeout, maxTime, startTime)
     self.log.info("INFO | automation.py | Application ran for: %s", str(datetime.now() - startTime))
 
     # Do a final check for zombie child processes.
     self.checkForZombies(processLog)
     self.automationutils.checkForCrashes(os.path.join(profileDir, "minidumps"), symbolsPath)
 
+    if os.path.exists(processLog):
+      os.unlink(processLog)
+
     if self.IS_TEST_BUILD and runSSLTunnel:
       ssltunnelProcess.kill()
 
-    if os.path.exists(processLog):
-      os.unlink(processLog)
-
     return status