Browse Source

Merge "Shut down the gearman server last in tests"

changes/92/79792/1
Jenkins 8 years ago committed by Gerrit Code Review
parent
commit
65d793acb6
  1. 2
      tests/test_scheduler.py

2
tests/test_scheduler.py

@ -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)

Loading…
Cancel
Save