зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1437529: --verify shudown node h2 server for phase2 r=gbrown
MozReview-Commit-ID: BwSgugC1k7A --HG-- extra : rebase_source : b05a8c7df09df2b8af21a9b6421537b1e57d659c
This commit is contained in:
Родитель
b3bb56d8ba
Коммит
c34eade22f
|
@ -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
|
||||||
|
|
Загрузка…
Ссылка в новой задаче