Bug 1417051 - Don't report test start/end twice.
The harness already logs the start and end of the test via mozlog.
So there is no need to do it twice. Especially because this requires
another command send to Marionette server.
MozReview-Commit-ID: 5JfU9XgbVqx
--- a/testing/marionette/harness/marionette_harness/marionette_test/testcases.py
+++ b/testing/marionette/harness/marionette_harness/marionette_test/testcases.py
@@ -13,17 +13,16 @@ import weakref
from unittest.case import (
_ExpectedFailure,
_UnexpectedSuccess,
SkipTest,
)
from marionette_driver.errors import (
- MarionetteException,
TimeoutException,
)
from mozlog import get_default_logger
def _wraps_parameterized(func, func_suffix, args, kwargs):
"""Internal: Decorator used in class MetaParameterized."""
def wrapper(self):
@@ -306,36 +305,24 @@ class MarionetteTestCase(CommonTestCase)
methodName=testname,
filepath=filepath,
testvars=testvars,
**kwargs))
def setUp(self):
super(MarionetteTestCase, self).setUp()
self.marionette.test_name = self.test_name
- self.marionette.execute_script(r"dump('TEST-START: {0}\n')"
- .format(self.test_name),
- sandbox="simpletest")
def tearDown(self):
# In the case no session is active (eg. the application was quit), start
# a new session for clean-up steps.
if not self.marionette.session:
self.marionette.start_session()
- if not self.marionette.crashed:
- try:
- self.marionette.execute_script(r"dump('TEST-END: {0}\n')"
- .format(self.test_name),
- sandbox="simpletest")
- self.marionette.test_name = None
- except (MarionetteException, IOError):
- # We have tried to log the test end when there is no listener
- # object that we can access
- pass
+ self.marionette.test_name = None
super(MarionetteTestCase, self).tearDown()
def wait_for_condition(self, method, timeout=30):
timeout = float(timeout) + time.time()
while time.time() < timeout:
value = method(self.marionette)
if value: