diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-25 18:40:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-25 18:40:43 +0000 |
| commit | b7eace115a22ee73f23c1650cca98bc4056da6e9 (patch) | |
| tree | 0266914ae521fc00e384e9ead0540bc568556b2e /tests | |
| parent | 23deeb5c5d9cb4e7947d48e89b199ae28acde8a5 (diff) | |
| parent | 7c77586582fa5cfaaeb3a31047b2671f34659440 (diff) | |
| download | zuul-b7eace115a22ee73f23c1650cca98bc4056da6e9.tar.gz | |
Merge "Add missing thread joins to tests"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/base.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/base.py b/tests/base.py index 742538de7..ff0ab09fd 100644 --- 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() |