Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge default -> production

--HG--
branch : production
  • Loading branch information...
commit fb61e658ceb23d7909fceb8cc50a4f1f24f7cf0d 2 parents 9be513c + 18b9692
@escapewindow escapewindow authored
Showing with 15 additions and 0 deletions.
  1. +15 −0 scripts/b2g_emulator_unittest.py
View
15 scripts/b2g_emulator_unittest.py
@@ -311,10 +311,21 @@ def preflight_run_tests(self):
if not os.path.isfile(self.adb_path):
self.fatal("The adb binary '%s' is not a valid file!" % self.adb_path)
+ def dump_ps(self):
+ # Bug 865837 - Dump the top ten processes that are using the most CPU
+ cmd = ['ps', '-eo', 'pcpu,pid,user,args']
+ lines = self.get_output_from_command(cmd, silent=True).split('\n')
+ lines.sort(reverse=True)
+ self.info('\n'.join(lines[0:10]))
+
def run_tests(self):
"""
Run the tests
"""
+
+ # Bug 865837: temporarily dump ps output to help debug an issue on ix slaves
+ self.dump_ps()
+
dirs = self.query_abs_dirs()
error_list = self.error_list
@@ -370,6 +381,10 @@ def run_tests(self):
self._dump_logcat(parser)
self.fatal("Failed to install gecko 5 times in a row, aborting")
+ # Bug 865837: temporarily dump ps output on failure
+ if return_code:
+ self.dump_ps()
+
tbpl_status, log_level = parser.evaluate_parser(return_code)
parser.append_tinderboxprint_line(suite_name)
Please sign in to comment.
Something went wrong with that request. Please try again.