zuul
/
zuul
Code Issues Proposed changes

Merge "Shut down the gearman server last in tests"

This commit is contained in:
Jenkins 2014-03-11 16:58:18 +00:00 committed by Gerrit Code Review
parent 20ed1a945e 491b3173d7
commit 65d793acb6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_scheduler.py
View File

@ -896,7 +896,6 @@ class TestScheduler(testtools.TestCase):
self.merge_server.join()
self.merge_client.stop()
self.worker.shutdown()
self.gearman_server.shutdown()
self.gerrit.stop()
self.timer.stop()
self.sched.stop()
@ -907,6 +906,7 @@ class TestScheduler(testtools.TestCase):
self.webapp.join()
self.rpc.stop()
self.rpc.join()
self.gearman_server.shutdown()
threads = threading.enumerate()
if len(threads) > 1:
self.log.error("More than one thread is running: %s" % threads)