From a3a04facf8e41c6a20f7e46605ed18449340a93e Mon Sep 17 00:00:00 2001 From: Vladimir Homutov <vl@nginx.com> Date: Thu, 31 Oct 2019 15:10:59 +0300 Subject: [PATCH] Python 3 support for the testsuite --- Dockerfile.test | 3 ++- t/README | 7 ++++++- t/ldap-auth.t | 2 +- t/runtests.sh | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile.test b/Dockerfile.test index 6985ce7..74dd54c 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,5 @@ -FROM python:2-alpine +ARG PYTHON_VERSION=2 +FROM python:${PYTHON_VERSION}-alpine WORKDIR /usr/src/app/ COPY nginx-ldap-auth-daemon.py /usr/src/app/ diff --git a/t/README b/t/README index e124895..deff24d 100644 --- a/t/README +++ b/t/README @@ -1,6 +1,11 @@ To run tests use supplied Dockerfile.test: -docker build -f Dockerfile.test -t my-tag . +docker build -f Dockerfile.test -t my-tag + +If you desire to use a container with Python3, you can supply an appropriate +build argument: + +docker build -f Dockerfile.test -t my-tag --build-arg PYTHON_VERSION=3 . docker run my-tag To run without Docker: diff --git a/t/ldap-auth.t b/t/ldap-auth.t index 22cc20f..5c5648b 100644 --- a/t/ldap-auth.t +++ b/t/ldap-auth.t @@ -433,7 +433,7 @@ system("ldapadd -H ldap://127.0.0.1:$p5 -x -D \"cn=root,ou=Users,dc=test,dc=loca $t->write_file_expand("auth_daemon.sh", <<"EOF"); AUTHBIN=\$(realpath $AUTHD) cd $d -exec coverage2 run \$AUTHBIN --host 127.0.0.1 \\ +exec coverage run \$AUTHBIN --host 127.0.0.1 \\ -p %%PORT_8888%% >$d/nginx-ldap-auth-dameon.stdlog 2>&1 EOF diff --git a/t/runtests.sh b/t/runtests.sh index 3c23f92..9950aa3 100755 --- a/t/runtests.sh +++ b/t/runtests.sh @@ -10,4 +10,4 @@ perl ldap-auth.t testdir=$(find /tmp -name 'nginx-test-*' -print -quit) cd $testdir -coverage2 html && printf "Coverage report: docker cp <cid>:$testdir/htmlcov <hostdir>\n" +coverage html && printf "Coverage report: docker cp <cid>:$testdir/htmlcov <hostdir>\n" -- GitLab