Merge pull request #72 from bgreni/integration-test-script

add integration tests

Author: saviorand

integration_test_client.mojo

@@ -0,0 +1,34 @@
+from lightbug_http import *
+from lightbug_http.client import Client
+from testing import *
+
+fn u(s: String) raises -> URI:
+    return URI.parse_raises("http://127.0.0.1:8080/" + s)
+
+struct IntegrationTest:
+    var client: Client
+
+    fn __init__(inout self):
+        self.client = Client()
+
+    fn test_redirect(inout self) raises:
+        var h = Headers(Header(HeaderKey.CONNECTION, 'keep-alive'))
+        var res = self.client.do(HTTPRequest(u("redirect"), headers=h))
+        assert_equal(res.status_code, StatusCode.OK)
+        assert_equal(to_string(res.body_raw), "yay you made it")
+        assert_equal(res.headers[HeaderKey.CONNECTION], "keep-alive")
+
+    fn test_close_connection(inout self) raises:
+        var h = Headers(Header(HeaderKey.CONNECTION, 'close'))
+        var res = self.client.do(HTTPRequest(u("close-connection"), headers=h))
+        assert_equal(res.status_code, StatusCode.OK)
+        assert_equal(to_string(res.body_raw), "connection closed")
+        assert_equal(res.headers[HeaderKey.CONNECTION], "close")
+
+    fn run_tests(inout self) raises:
+        self.test_redirect()
+        self.test_close_connection()
+
+fn main() raises:
+    var test = IntegrationTest()
+    test.run_tests()

integration_test_server.mojo

@@ -0,0 +1,25 @@
+from lightbug_http import *
+
+@value
+struct IntegerationTestService(HTTPService):
+    fn func(self, req: HTTPRequest) raises -> HTTPResponse:
+        var p = req.uri.path
+        if p == "/redirect":
+            return HTTPResponse(
+                "get off my lawn".as_bytes_slice(),
+                headers=Headers(
+                    Header(HeaderKey.LOCATION, "/rd-destination")
+                ),
+                status_code=StatusCode.PERMANENT_REDIRECT
+            )
+        elif p == "/rd-destination":
+            return OK("yay you made it")
+        elif p == "/close-connection":
+            return OK("connection closed")
+
+        return NotFound("wrong")
+
+fn main() raises:
+    var server = Server(tcp_keep_alive=True)
+    server.listen_and_serve("127.0.0.1:8080", IntegerationTestService())
+            

lightbug_http/__init__.mojo

@@ -1,4 +1,4 @@
-from lightbug_http.http import HTTPRequest, HTTPResponse, OK, NotFound
+from lightbug_http.http import HTTPRequest, HTTPResponse, OK, NotFound, StatusCode
 from lightbug_http.uri import URI
 from lightbug_http.header import Header, Headers, HeaderKey
 from lightbug_http.cookie import Cookie, RequestCookieJar, ResponseCookieJar

lightbug_http/client.mojo

@@ -25,13 +25,13 @@ struct Client:
 
     var _connections: Dict[String, SysConnection]
 
-    fn __init__(inout self) raises:
+    fn __init__(inout self):
         self.host = "127.0.0.1"
         self.port = 8888
         self.name = "lightbug_http_client"
         self._connections = Dict[String, SysConnection]()
 
-    fn __init__(inout self, host: StringLiteral, port: Int) raises:
+    fn __init__(inout self, host: StringLiteral, port: Int):
         self.host = host
         self.port = port
         self.name = "lightbug_http_client"

lightbug_http/http/request.mojo

@@ -85,7 +85,7 @@ struct HTTPRequest(Formattable, Stringable):
         self.timeout = timeout
         self.set_content_length(len(body))
         if HeaderKey.CONNECTION not in self.headers:
-            self.set_connection_close()
+            self.headers[HeaderKey.CONNECTION] = "keep-alive"
         if HeaderKey.HOST not in self.headers:
             self.headers[HeaderKey.HOST] = uri.host
 

lightbug_http/net.mojo

@@ -134,7 +134,7 @@ struct NoTLSListener:
         _ = shutdown(self.fd, SHUT_RDWR)
         var close_status = close(self.fd)
         if close_status == -1:
-            print("Failed to close new_sockfd")
+            print("Failed to close listener")
 
     fn addr(self) -> TCPAddr:
         return self.__addr
@@ -260,7 +260,7 @@ struct SysConnection(Connection):
         _ = shutdown(self.fd, SHUT_RDWR)
         var close_status = close(self.fd)
         if close_status == -1:
-            print("Failed to close new_sockfd")
+            print("Failed to close connection")
 
     fn local_addr(inout self) raises -> TCPAddr:
         return self.laddr

lightbug_http/server.mojo

@@ -160,12 +160,6 @@ struct Server:
         Raises:
         If there is an error while serving the connection.
         """
-        # var b = Bytes(capacity=default_buffer_size)
-        # var bytes_recv = conn.read(b)
-        # if bytes_recv == 0:
-        #     conn.close()
-        #     return
-
         var max_request_body_size = self.max_request_body_size()
         if max_request_body_size <= 0:
             max_request_body_size = default_max_request_body_size
@@ -185,11 +179,12 @@ struct Server:
 
             var res = handler.func(request)
 
-            if not self.tcp_keep_alive:
-                _ = res.set_connection_close()
+            var close_connection = (not self.tcp_keep_alive) or request.connection_close()
+
+            if close_connection:
+                res.set_connection_close()
 
-            _ = conn.write(encode(res^))
+            var written = conn.write(encode(res^))
 
-            if not self.tcp_keep_alive:
+            if close_connection or written == -1:
                 conn.close()
-                return

mojoproject.toml

@@ -10,6 +10,7 @@ version = "0.1.5"
 build = { cmd = "rattler-build build --recipe recipes -c https://conda.modular.com/max -c conda-forge --skip-existing=all", env = {MODULAR_MOJO_IMPORT_PATH = "$CONDA_PREFIX/lib/mojo"} }
 publish = { cmd = "bash scripts/publish.sh", env = { PREFIX_API_KEY = "$PREFIX_API_KEY" } }
 test = { cmd = "magic run mojo test -I . tests" }
+integration_test = { cmd = "bash scripts/integration_test.sh" }
 bench = { cmd = "magic run mojo bench.mojo" }
 bench_server = { cmd = "bash scripts/bench_server.sh" }
 format = { cmd = "magic run mojo format -l 120 lightbug_http" }

scripts/integration_test.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+
+(magic run mojo build integration_test_server.mojo) || exit 1
+(magic run mojo build integration_test_client.mojo) || exit 1
+
+echo "starting server..."
+./integration_test_server &
+
+sleep 5
+
+echo "starting test suite"
+./integration_test_client
+
+kill $!
+wait $! 2>/dev/null
+echo "cleaning up binaries"
+rm ./integration_test_server
+rm ./integration_test_client