From 5b0ecff3cc3848eff57e71eebf77ee1833ebc705 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Jun 2015 12:35:07 +0530
Subject: [PATCH] ...

---
 src/calibre/srv/tests/base.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/srv/tests/base.py b/src/calibre/srv/tests/base.py
index fe8e59c5a9..ac3016a896 100644
--- a/src/calibre/srv/tests/base.py
+++ b/src/calibre/srv/tests/base.py
@@ -108,6 +108,7 @@ class TestServer(Thread):
 
     def __exit__(self, *args):
         self.loop.stop()
+        self.join(self.loop.opts.shutdown_timeout)
 
     def connect(self, timeout=None):
         if timeout is None: