resolve merge conflicts

Author: saviorand

lightbug.🔥

@@ -1,33 +1,33 @@
-from lightbug_http import *
 from sys import is_defined
-from lightbug_http.middleware.helpers import Success
+from lightbug_http import *
 
 struct HelloWorld(HTTPHandler):
     fn handle(self, context: Context) -> HTTPResponse:
         var name = context.params.get("username", "world")
         return Success("Hello, " + name + "!")
 
 fn main() raises:
-    if is_defined["TEST"]():
+    if not is_defined["TEST"]():
+        var router = RouterMiddleware()
+        router.add("GET", "/hello", HelloWorld())
+
+        var middleware = MiddlewareChain()
+        middleware.add(CompressionMiddleware())
+        middleware.add(ErrorMiddleware())
+        middleware.add(LoggerMiddleware())
+        middleware.add(CorsMiddleware(allows_origin = "*"))
+        middleware.add(BasicAuthMiddleware("admin", "password"))
+        middleware.add(StaticMiddleware("static"))
+        middleware.add(router)
+        middleware.add(NotFoundMiddleware())
+
+        var server = SysServer()
+        server.listen_and_serve("0.0.0.0:8080", middleware)
+    else:
         try:
             run_tests()
             print("Test suite passed")
         except e:
             print("Test suite failed: " + e.__str__())
-    else:
-        var router = RouterMiddleware()
-    router.add("GET", "/hello", HelloWorld())
-
-    var middleware = MiddlewareChain()
-    middleware.add(CompressionMiddleware())
-    middleware.add(ErrorMiddleware())
-    middleware.add(LoggerMiddleware())
-    middleware.add(CorsMiddleware(allows_origin = "*"))
-    middleware.add(BasicAuthMiddleware("admin", "password"))
-    middleware.add(StaticMiddleware("static"))
-    middleware.add(router)
-    middleware.add(NotFoundMiddleware())
-
-    var server = SysServer()
-            server.listen_and_serve("0.0.0.0:8080", middleware)
+        
 

lightbug_http/__init__.mojo

@@ -1,8 +1,8 @@
 from lightbug_http.http import HTTPRequest, HTTPResponse, OK
 from lightbug_http.service import HTTPService, Welcome
 from lightbug_http.sys.server import SysServer
-from lightbug_http.tests.run import run_testsfrom lightbug_http.middleware import *
-
+from lightbug_http.tests.run import run_tests
+from lightbug_http.middleware import *
 
 trait DefaultConstructible:
     fn __init__(inout self) raises:

lightbug_http/middleware/__init__.mojo

@@ -1,3 +1,4 @@
+from lightbug_http.middleware.helpers import Success
 from lightbug_http.middleware.middleware import Context, Middleware, MiddlewareChain
 
 from lightbug_http.middleware.basicauth import BasicAuthMiddleware