mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-26523 mark resmoke teardown failures as ServerFailures

Browse Source
This commit is contained in:
Robert Guo 2016-12-07 13:41:47 -05:00
parent a1454c7f3d
commit e8a3a9266c
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
buildscripts/resmokelib/testing/hooks.py
View File

@ -123,15 +123,13 @@ class CleanEveryN(CustomBehavior):
self.tests_run)
self.tests_run = 0
teardown_success = self.fixture.teardown()
if not self.fixture.teardown():
raise errors.ServerFailure("%s did not exit cleanly" % (self.fixture))
self.logger.info("Starting the fixture back up again...")
self.fixture.setup()
self.fixture.await_ready()
# Raise this after calling setup in case --continueOnFailure was specified.
if not teardown_success:
raise errors.TestFailure("%s did not exit cleanly" % (self.fixture))
class JsCustomBehavior(CustomBehavior):
def __init__(self, logger, fixture, js_filename, description, shell_options=None):
@ -212,13 +210,12 @@ class BackgroundInitialSync(JsCustomBehavior):
raise errors.TestFailure(err.args[0])
else:
# Tear down and restart the initial sync node to start initial sync again.
teardown_success = sync_node.teardown()
if not sync_node.teardown():
raise errors.ServerFailure("%s did not exit cleanly" % (sync_node))
self.fixture.logger.info("Starting the initial sync node back up again...")
sync_node.setup()
sync_node.await_ready()
if not teardown_success:
raise errors.TestFailure("%s did not exit cleanly" % (sync_node))
# If it's been 'n' tests so far, wait for the initial sync node to finish syncing.
if self.tests_run >= self.n:
@ -318,7 +315,6 @@ class IntermediateInitialSync(JsCustomBehavior):
sync_node_conn = utils.new_mongo_client(port=sync_node.port)
description = "{0} after running '{1}'".format(self.description, test.short_name())
teardown_success = True
if self.use_resync:
self.fixture.logger.info("Calling resync on initial sync node...")
cmd = bson.SON([("resync", 1)])
@ -329,7 +325,8 @@ class IntermediateInitialSync(JsCustomBehavior):
test_report.addFailure(self.hook_test_case, sys.exc_info())
raise errors.TestFailure(err.args[0])
else:
teardown_success = sync_node.teardown()
if not sync_node.teardown():
raise errors.ServerFailure("%s did not exit cleanly" % (sync_node))
self.fixture.logger.info("Starting the initial sync node back up again...")
sync_node.setup()
@ -350,8 +347,6 @@ class IntermediateInitialSync(JsCustomBehavior):
# Run data validation and dbhash checking.
JsCustomBehavior.after_test(self, test, test_report)
if not teardown_success:
raise errors.TestFailure("%s did not exit cleanly" % (sync_node))
class ValidateCollections(JsCustomBehavior):
"""