diff --git a/tests/apps/config/.null b/tests/apps/config/.null new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/apps/config/Procfile b/tests/apps/config/Procfile index ae7366d4107..a79eaf1c8da 100644 --- a/tests/apps/config/Procfile +++ b/tests/apps/config/Procfile @@ -1 +1 @@ -web: node web.js +web: python3 -u web.py diff --git a/tests/apps/config/check_deploy b/tests/apps/config/check_deploy index d0ad9f3aff1..358dce43366 100755 --- a/tests/apps/config/check_deploy +++ b/tests/apps/config/check_deploy @@ -11,6 +11,7 @@ test_url() { } base_url="$1" -test_url / "config-test" +test_url / "python/http.server" +test_url /conftest "config-test" test_url /hello "Hello 'world'" diff --git a/tests/apps/config/package.json b/tests/apps/config/package.json deleted file mode 100644 index ccb5634d4f9..00000000000 --- a/tests/apps/config/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "node-example", - "version": "0.0.1", - "dependencies": { - "express": "4.18.x" - }, - "engines": { - "node": "4.2.x" - } -} diff --git a/tests/apps/config/web.js b/tests/apps/config/web.js deleted file mode 100644 index d1a7cefa69e..00000000000 --- a/tests/apps/config/web.js +++ /dev/null @@ -1,16 +0,0 @@ -var express = require('express'); - -var app = express(); - -app.get('/', function(request, response) { - response.send(process.env.CONFTEST); -}); - -app.get('/hello', function(request, response) { - response.send(process.env.HELLO); -}); - -var port = process.env.PORT || 5000; -app.listen(port, function() { - console.log("Listening on " + port); -}); diff --git a/tests/apps/config/web.py b/tests/apps/config/web.py new file mode 100644 index 00000000000..ed15a73b07e --- /dev/null +++ b/tests/apps/config/web.py @@ -0,0 +1,37 @@ +import http.server +import json +import os +import sys + + +class GetHandler(http.server.BaseHTTPRequestHandler): + def do_GET(self): + self.send_response(200) + self.send_header("Content-Type", "text/plain; charset=utf-8") + self.end_headers() + + if self.path == '/': + self.wfile.write("python/http.server".encode("utf-8")) + elif self.path == '/conftest': + value = os.getenv("CONFTEST", "") + self.wfile.write(value.encode("utf-8")) + elif self.path == '/hello': + value = os.getenv("HELLO", "") + self.wfile.write(value.encode("utf-8")) + else: + data = json.dumps(dict(os.environ), sort_keys=True, indent=4) + self.wfile.write(data.encode("utf-8")) + + +if __name__ == "__main__": + if os.getenv("FAIL_ON_STARTUP") == "true": + print("Failing on startup due to FAIL_ON_STARTUP=true") + sys.exit(1) + + for arg in sys.argv: + print(f"Arg: {arg}") + + port = int(os.getenv("PORT", 5000)) + server = http.server.HTTPServer(("0.0.0.0", port), GetHandler) + print("Listening on port {0}".format(port)) + server.serve_forever() diff --git a/tests/apps/python/web.py b/tests/apps/python/web.py index 5d7a7795383..ed15a73b07e 100644 --- a/tests/apps/python/web.py +++ b/tests/apps/python/web.py @@ -12,6 +12,12 @@ def do_GET(self): if self.path == '/': self.wfile.write("python/http.server".encode("utf-8")) + elif self.path == '/conftest': + value = os.getenv("CONFTEST", "") + self.wfile.write(value.encode("utf-8")) + elif self.path == '/hello': + value = os.getenv("HELLO", "") + self.wfile.write(value.encode("utf-8")) else: data = json.dumps(dict(os.environ), sort_keys=True, indent=4) self.wfile.write(data.encode("utf-8"))