Merge "Add missing thread joins to tests"

2019-03-25 18:40:43 +00:00
parent 23deeb5c5d 7c77586582
commit b7eace115a
1 changed files with 2 additions and 0 deletions
--- a/tests/base.py
+++ b/tests/base.py
@@ -2909,7 +2909,9 @@ class ZuulTestCase(BaseTestCase):
        self.merge_client.stop()
        if self.merge_server:
            self.merge_server.stop()
+            self.merge_server.join()
        self.executor_server.stop()
+        self.executor_server.join()
        self.sched.stop()
        self.sched.join()
        self.statsd.stop()