commit 65d793acb6cf61d0820bcf4777fccd354712104f
author Jenkins <jenkins@review.openstack.org> Tue Mar 11 16:58:18 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Mar 11 16:58:18 2014 +0000
tree 1f19c61c4a79b5228875e7a20608e564ed6617c8
parent 20ed1a945e89397d6e30803ff11dafab087a5634
parent 491b3173d7d27e118c8dca618411eb5f6c19d473

Merge "Shut down the gearman server last in tests"

tests/test_scheduler.py

diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 5a265be..5bd8b00 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -896,7 +896,6 @@
         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 @@
         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)