Bug 1437529: --verify shudown node h2 server for phase2 r=gbrown

MozReview-Commit-ID: BwSgugC1k7A
This commit is contained in:
Patrick McManus
2018-02-12 09:57:48 -05:00
parent 4d9d24029d
commit 763886d94c

View File

@@ -1368,6 +1368,7 @@ class XPCShellTests(object):
status = self.runTestList(tests_queue, sequential_tests, testClass, status = self.runTestList(tests_queue, sequential_tests, testClass,
mobileArgs, **kwargs) mobileArgs, **kwargs)
self.shutdownNode()
else: else:
# #
# Test verification: Run each test many times, in various configurations, # Test verification: Run each test many times, in various configurations,
@@ -1437,6 +1438,7 @@ class XPCShellTests(object):
self.log.info(':::') self.log.info(':::')
self.log.info('::: Test verification %s' % finalResult) self.log.info('::: Test verification %s' % finalResult)
self.log.info(':::') self.log.info(':::')
self.shutdownNode()
return status return status
@@ -1547,7 +1549,6 @@ class XPCShellTests(object):
# restore default SIGINT behaviour # restore default SIGINT behaviour
signal.signal(signal.SIGINT, signal.SIG_DFL) signal.signal(signal.SIGINT, signal.SIG_DFL)
self.shutdownNode()
# Clean up any slacker directories that might be lying around # Clean up any slacker directories that might be lying around
# Some might fail because of windows taking too long to unlock them. # Some might fail because of windows taking too long to unlock them.
# We don't do anything if this fails because the test slaves will have # We don't do anything if this fails because the test slaves will have