1 From c1791ee90fdd8adf219ae3d2b849f5f041284b7c Mon Sep 17 00:00:00 2001
2 From: Rich Megginson <rmeggins@redhat.com>
3 Date: Thu, 17 May 2018 18:38:25 -0600
4 Subject: [PATCH] mmkubernetes test python must encode response
6 https://github.com/rsyslog/rsyslog/issues/2721
7 Was not working on python3 - must use `encode()` to convert the
8 string to a `bytes` object.
9 Also run the server with python -u to make sure we get the log
10 output from the kubernetes test server.
12 tests/mmkubernetes-basic.sh | 2 +-
13 tests/mmkubernetes_test_server.py | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
16 diff --git a/tests/mmkubernetes-basic.sh b/tests/mmkubernetes-basic.sh
17 index 0bbfd08ca..d320c343f 100755
18 --- a/tests/mmkubernetes-basic.sh
19 +++ b/tests/mmkubernetes-basic.sh
21 . $srcdir/diag.sh init
23 testsrv=mmk8s-test-server
24 -python ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
25 +python -u ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
27 . $srcdir/diag.sh wait-startup $testsrv
28 echo background mmkubernetes_test_server.py process id is $BGPROCESS
29 diff --git a/tests/mmkubernetes_test_server.py b/tests/mmkubernetes_test_server.py
30 index 0de215603..24f4e1b0e 100644
31 --- a/tests/mmkubernetes_test_server.py
32 +++ b/tests/mmkubernetes_test_server.py
33 @@ -104,7 +104,7 @@ def do_GET(self):
35 self.send_response(status)
37 - self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')))
38 + self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')).encode())
40 port = int(sys.argv[1])