public_git
/
nginx-ldap-auth
mirror of https://github.com/nginxinc/nginx-ldap-auth.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Python 3 support for the testsuite

This commit is contained in:
Vladimir Homutov 2019-10-31 15:10:59 +03:00
parent b5eca063d5
commit a3a04facf8
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.test
View File

@ -1,4 +1,5 @@
FROM python:2-alpine ARG PYTHON_VERSION=2
FROM python:${PYTHON_VERSION}-alpine
WORKDIR /usr/src/app/ WORKDIR /usr/src/app/
COPY nginx-ldap-auth-daemon.py /usr/src/app/ COPY nginx-ldap-auth-daemon.py /usr/src/app/

7
t/README
View File

@ -1,6 +1,11 @@
To run tests use supplied Dockerfile.test: 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 docker run my-tag
To run without Docker: To run without Docker:

2
t/ldap-auth.t
View File

@ -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"); $t->write_file_expand("auth_daemon.sh", <<"EOF");
AUTHBIN=\$(realpath $AUTHD) AUTHBIN=\$(realpath $AUTHD)
cd $d 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 -p %%PORT_8888%% >$d/nginx-ldap-auth-dameon.stdlog 2>&1
EOF EOF

2
t/runtests.sh
View File

@ -10,4 +10,4 @@ perl ldap-auth.t
testdir=$(find /tmp -name 'nginx-test-*' -print -quit) testdir=$(find /tmp -name 'nginx-test-*' -print -quit)
cd $testdir 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"