Merge branches 'master' and 'master' of github.com:dherault/serverles…

…s-offline
dherault · Aug 30, 2024 · 209272d · 209272d
2 parents 7662038 + 79288e7
commit 209272d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 28 deletions.
diff --git a/src/events/http/HttpServer.js b/src/events/http/HttpServer.js
@@ -645,7 +645,7 @@ export default class HttpServer {
       /* RESPONSE SELECTION (among endpoint's possible responses) */
 
       // Failure handling
-      let errorStatusCode = "500"
+      let errorStatusCode = "502"
 
       if (err) {
         const errorMessage = (err.message || err).toString()
@@ -655,17 +655,14 @@ export default class HttpServer {
         if (found && found.length > 1) {
           ;[, errorStatusCode] = found
         } else {
-          errorStatusCode = "500"
+          errorStatusCode = "502"
         }
 
         // Mocks Lambda errors
         result = {
-          body: JSON.stringify({
-            message: errorMessage,
-            stackTrace: this.#getArrayStackTrace(err.stack),
-            type: err.constructor.name,
-          }),
-          statusCode: errorStatusCode,
+          errorMessage,
+          errorType: err.constructor.name,
+          stackTrace: this.#getArrayStackTrace(err.stack),
         }
 
         log.error(errorMessage)

diff --git a/src/lambda/handler-runner/python-runner/PythonRunner.js b/src/lambda/handler-runner/python-runner/PythonRunner.js
@@ -104,9 +104,9 @@ export default class PythonRunner {
       })
 
       const onErr = (data) => {
-        log.notice(data.toString())
+        // TODO
 
-        rej(new Error("Internal Server Error"))
+        log.notice(data.toString())
       }
 
       const onLine = (line) => {

diff --git a/tests/runtimes/python/python3/handler.py b/tests/runtimes/python/python3/handler.py
@@ -9,6 +9,3 @@ def hello(event, context):
         "body": json.dumps(body),
         "statusCode": 200,
     }
-
-def error(event, context):
-    raise Exception("This is an error")
diff --git a/tests/runtimes/python/python3/python3.test.js b/tests/runtimes/python/python3/python3.test.js
@@ -37,13 +37,4 @@ describe("Python 3 tests", function desc() {
       assert.deepEqual(json, expected)
     })
   })
-
-  it("should return a 500 on error", async () => {
-    const url = new URL("/dev/error", BASE_URL)
-    const response = await fetch(url)
-    const json = await response.json()
-
-    assert.equal(response.status, 500)
-    assert.equal(json.message, "Internal Server Error")
-  })
 })
diff --git a/tests/runtimes/python/python3/serverless.yml b/tests/runtimes/python/python3/serverless.yml
@@ -23,9 +23,3 @@ functions:
           method: get
           path: hello
     handler: handler.hello
-  error:
-    events:
-      - http:
-          method: get
-          path: error
-    handler: handler.error