Bug 870745 - Remove incorrect self argument from killAndGetStack. r=ted
authorJosh Matthews <josh@joshmatthews.net>
Fri, 10 May 2013 10:50:51 -0400
changeset 131597 c7ec282a261ff7a3423337fb42075e09fecf08b4
parent 131596 623e10644c021eec55b3681476804cbe047d78d1
child 131598 ed0e9d2f23a031334927747c1e44bdbade56ff4c
push id24665
push userdbaron@mozilla.com
push dateSun, 12 May 2013 05:31:48 +0000
treeherdermozilla-central@d68224f5325b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs870745
milestone23.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 870745 - Remove incorrect self argument from killAndGetStack. r=ted
build/automation.py.in
testing/xpcshell/runxpcshelltests.py
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -912,17 +912,17 @@ user_pref("camino.use_system_proxy_setti
     encoded = base64.b64encode(image)
     self.log.info("SCREENSHOT: data:image/png;base64,%s", encoded)
 
   def killAndGetStack(self, processPID, utilityPath, debuggerInfo):
     """Kill the process, preferrably in a way that gets us a stack trace.
        Also attempts to obtain a screenshot before killing the process."""
     if not debuggerInfo:
       self.dumpScreen(utilityPath)
-    self.killAndGetStackNoScreenshot(self, processPID, utilityPath, debuggerInfo)
+    self.killAndGetStackNoScreenshot(processPID, utilityPath, debuggerInfo)
 
   def killAndGetStackNoScreenshot(self, processPID, utilityPath, debuggerInfo):
     """Kill the process, preferrably in a way that gets us a stack trace."""
     if self.CRASHREPORTER and not debuggerInfo:
       if self.UNIXISH:
         # ABRT will get picked up by Breakpad's signal handler
         os.kill(processPID, signal.SIGABRT)
         return
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -573,17 +573,17 @@ class XPCShellTests(object):
         testsuite.setAttribute("tests", str(total))
         testsuite.setAttribute("failures", str(failed))
         testsuite.setAttribute("skip", str(skipped))
 
         doc.writexml(fh, addindent="  ", newl="\n", encoding="utf-8")
 
     def testTimeout(self, test, processPID):
         self.log.error("TEST-UNEXPECTED-FAIL | %s | Test timed out" % test)
-        Automation().killAndGetStackNoScreenshot(processPID, self.appPath, None)
+        Automation().killAndGetStackNoScreenshot(processPID, self.appPath, self.debuggerInfo)
 
     def post_to_autolog(self, results, name):
         from moztest.results import TestContext, TestResult, TestResultCollection
         from moztest.output.autolog import AutologOutput
 
         context = TestContext(
             testgroup='b2g xpcshell testsuite',
             operating_system='android',