Merged with the default branch.1.17.0-1

5 files changed, 2 insertions, 25 deletions

diff --git a/test/python/delayed/wsgi.py b/test/python/delayed/wsgi.py
index d25e2765..3eb5a6f8 100644
--- a/test/python/delayed/wsgi.py
+++ b/test/python/delayed/wsgi.py
@@ -11,6 +11,7 @@ def application(environ, start_response):
     write = start_response('200', [('Content-Length', str(len(body)))])
 
     if not body:
+        time.sleep(delay)
         return []
 
     step = int(len(body) / parts)
diff --git a/test/python/log_body/wsgi.py b/test/python/log_body/wsgi.py
index 9dcb1b0c..0ec07a68 100644
--- a/test/python/log_body/wsgi.py
+++ b/test/python/log_body/wsgi.py
@@ -2,7 +2,7 @@ def application(environ, start_response):
     content_length = int(environ.get('CONTENT_LENGTH', 0))
     body = bytes(environ['wsgi.input'].read(content_length))
 
-    environ['wsgi.errors'].write(body)
+    environ['wsgi.errors'].write(body.decode())
     environ['wsgi.errors'].flush()
 
     start_response('200', [('Content-Length', '0')])
diff --git a/test/python/upstreams/0/wsgi.py b/test/python/upstreams/0/wsgi.py
deleted file mode 100644
index 2c88979b..00000000
--- a/test/python/upstreams/0/wsgi.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import time
-
-def application(env, start_response):
-    delay = int(env.get('HTTP_X_DELAY', 0))
-
-    start_response('200', [('Content-Length', '0'), ('X-Upstream', '0')])
-    time.sleep(delay)
-    return []
diff --git a/test/python/upstreams/1/wsgi.py b/test/python/upstreams/1/wsgi.py
deleted file mode 100644
index 5077bdb1..00000000
--- a/test/python/upstreams/1/wsgi.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import time
-
-def application(env, start_response):
-    delay = int(env.get('HTTP_X_DELAY', 0))
-
-    start_response('200', [('Content-Length', '0'), ('X-Upstream', '1')])
-    time.sleep(delay)
-    return []
diff --git a/test/python/upstreams/2/wsgi.py b/test/python/upstreams/2/wsgi.py
deleted file mode 100644
index bb0ce797..00000000
--- a/test/python/upstreams/2/wsgi.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import time
-
-def application(env, start_response):
-    delay = int(env.get('HTTP_X_DELAY', 0))
-
-    start_response('200', [('Content-Length', '0'), ('X-Upstream', '2')])
-    time.sleep(delay)
-    return []