Set up __main__.py, use it in tests

This allows us to invoke dkimpy-milter as "python -m dkimpy_milter
dkimpy-milter.conf", which makes running the test suite easier.
This commit is contained in:
Daniel Kahn Gillmor
2019-02-19 17:50:32 -05:00
parent 5c1d5d6e52
commit 7bfb87fab7
3 changed files with 13 additions and 2 deletions
+6
View File
@@ -0,0 +1,6 @@
#!/usr/bin/python2
from dkimpy_milter import main
if __name__ == "__main__":
main()
+2
View File
@@ -0,0 +1,2 @@
#!/bin/sh
python2 -m dkimpy_milter "$@"
+5 -2
View File
@@ -3,9 +3,12 @@
set -e set -e
WORKDIR=$(mktemp -d) WORKDIR=$(mktemp -d)
TESTDIR=$(realpath "$(dirname "$0")") TESTDIR=$(realpath "$(dirname "$0")")
DKIMPY_MILTER=${DKIMPY_MILTER:-"$TESTDIR/dkimpy-milter"}
cd "$WORKDIR" cd "$WORKDIR"
printf "Testing %s from directory %s\n" "$DKIMPY_MILTER" "$WORKDIR"
dknewkey --ktype ed25519 testkey dknewkey --ktype ed25519 testkey
cat > signing.conf <<EOF cat > signing.conf <<EOF
Domain example.net Domain example.net
@@ -45,8 +48,8 @@ cleanup() {
rm -rf "$WORKDIR" rm -rf "$WORKDIR"
} }
PYTHONPATH="$(dirname "$TESTDIR")" dkimpy-milter signing.conf 2>signing.stderr & PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" signing.conf 2>signing.stderr &
PYTHONPATH="$(dirname "$TESTDIR")" dkimpy-milter verify.conf 2>verify.stderr & PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" verify.conf 2>verify.stderr &
trap cleanup EXIT trap cleanup EXIT
# ugly ugly (how are we supposed to know that the filter is ready?): # ugly ugly (how are we supposed to know that the filter is ready?):