Slightly improve HttpsTestServerLayer

- Send Content-Length header based on the encoded response body
- Additionally send "Connection: close" header
- Reduce sleep time after starting the server thread

Author: amotl

src/crate/client/tests.py

@@ -110,6 +110,7 @@ def setUpMocked(test):
 local = '127.0.0.1'
 crate_host = "{host}:{port}".format(host=local, port=crate_port)
 crate_uri = "http://%s" % crate_host
+crate_layer = None
 
 
 def ensure_cratedb_layer():
@@ -213,7 +214,7 @@ class Location(Base):
     test.globs['CrateDialect'] = CrateDialect
 
 
-class HttpsTestServerLayer(object):
+class HttpsTestServerLayer:
     PORT = 65534
     HOST = "localhost"
     CERT_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__),
@@ -238,11 +239,12 @@ class HttpsHandler(BaseHTTPRequestHandler):
 
         def do_GET(self):
             self.send_response(200)
-            self.send_header("Content-Length", len(self.payload))
+            payload = self.payload.encode('UTF-8')
+            self.send_header("Content-Length", len(payload))
             self.send_header("Content-Type", "application/json; charset=UTF-8")
+            self.send_header("Connection", "close")
             self.end_headers()
-            self.wfile.write(self.payload.encode('UTF-8'))
-            return
+            self.wfile.write(payload)
 
     def __init__(self):
         self.server = self.HttpsServer(
@@ -254,7 +256,7 @@ def setUp(self):
         thread = threading.Thread(target=self.serve_forever)
         thread.daemon = True  # quit interpreter when only thread exists
         thread.start()
-        time.sleep(1)
+        time.sleep(0.5)
 
     def serve_forever(self):
         print("listening on", self.HOST, self.PORT)