From 7bfb87fab7720bd4c0f09d550020bd7218469ec7 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 19 Feb 2019 17:50:32 -0500
Subject: [PATCH] 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.
---
 dkimpy_milter/__main__.py | 6 ++++++
 tests/dkimpy-milter       | 2 ++
 tests/runtests            | 7 +++++--
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 dkimpy_milter/__main__.py
 create mode 100755 tests/dkimpy-milter

diff --git a/dkimpy_milter/__main__.py b/dkimpy_milter/__main__.py
new file mode 100644
index 0000000..8c5cf9c
--- /dev/null
+++ b/dkimpy_milter/__main__.py
@@ -0,0 +1,6 @@
+#!/usr/bin/python2
+
+from dkimpy_milter import main
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/dkimpy-milter b/tests/dkimpy-milter
new file mode 100755
index 0000000..39b64d5
--- /dev/null
+++ b/tests/dkimpy-milter
@@ -0,0 +1,2 @@
+#!/bin/sh
+python2 -m dkimpy_milter "$@"
diff --git a/tests/runtests b/tests/runtests
index 52874e0..d535e9f 100755
--- a/tests/runtests
+++ b/tests/runtests
@@ -3,9 +3,12 @@
 set -e
 WORKDIR=$(mktemp -d)
 TESTDIR=$(realpath "$(dirname "$0")")
+DKIMPY_MILTER=${DKIMPY_MILTER:-"$TESTDIR/dkimpy-milter"}
 
 cd "$WORKDIR"
 
+printf "Testing %s from directory %s\n" "$DKIMPY_MILTER" "$WORKDIR"
+
 dknewkey --ktype ed25519 testkey
 cat > signing.conf <<EOF
 Domain example.net
@@ -45,8 +48,8 @@ cleanup() {
     rm -rf "$WORKDIR"
 }
 
-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" signing.conf 2>signing.stderr &
+PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" verify.conf 2>verify.stderr &
 trap cleanup EXIT
 
 # ugly ugly (how are we supposed to know that the filter is ready?):