From 9db150a9cee0ee1f15a62e700847b7d2c28919fc Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Mon, 10 Feb 2014 14:08:39 -0500 Subject: [PATCH] Bug 949028 - Marionette runner should check for crash after each test, r=mdas --- testing/marionette/client/marionette/marionette_test.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testing/marionette/client/marionette/marionette_test.py b/testing/marionette/client/marionette/marionette_test.py index 4a743445d794..3f1459fa6abf 100644 --- a/testing/marionette/client/marionette/marionette_test.py +++ b/testing/marionette/client/marionette/marionette_test.py @@ -165,8 +165,6 @@ class CommonTestCase(unittest.TestCase): result.addFailure(self, sys.exc_info()) except KeyboardInterrupt: raise - except self.failureException: - result.addFailure(self, sys.exc_info()) except _ExpectedFailure as e: expected_failure(result, e.exc_info) except _UnexpectedSuccess: @@ -275,7 +273,7 @@ permissions.forEach(function (perm) { self.marionette.timeouts(self.marionette.TIMEOUT_PAGE, 30000) def tearDown(self): - pass # bug 874599 + pass def cleanTest(self): self._deleteSession() @@ -337,6 +335,7 @@ class MarionetteTestCase(CommonTestCase): (self.filepath.replace('\\', '\\\\'), self.methodName)) def tearDown(self): + self.marionette.check_for_crash() self.marionette.set_context("content") self.marionette.execute_script("log('TEST-END: %s:%s')" % (self.filepath.replace('\\', '\\\\'), self.methodName))