DandelionNStuff/dkimpy-milter-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add verify runtests for stable and table cases

Browse Source
This commit is contained in:
Scott Kitterman
2019-10-23 01:15:32 -04:00
parent 0115bf7c7c
commit b0604bf00c
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/runtests
+21 -4
View File
@@ -36,6 +36,7 @@ Socket unix:$keytype.signing.sock
PidFile $keytype.signing.pid PidFile $keytype.signing.pid
Mode s Mode s
UserID $(id --name --user):$(id --name --group) UserID $(id --name --user):$(id --name --group)
debugLevel 5
EOF EOF
cat > "$keytype.verify.conf" <<EOF cat > "$keytype.verify.conf" <<EOF
@@ -46,7 +47,7 @@ DNSOverride $(cat testkey.$keytype.dns)
UserID $(id --name --user):$(id --name --group) UserID $(id --name --user):$(id --name --group)
EOF EOF
cat > "$keytype.stable.conf" <<EOF cat > "$keytype.stable.conf" <<EOF
$keyfile testkey.$keytype.key $keyfile testkey.$keytype.key
$selector testkey $selector testkey
$signingtable $WORKDIR/signing-table $signingtable $WORKDIR/signing-table
@@ -55,6 +56,14 @@ PidFile $keytype.stable.pid
Mode s Mode s
UserID $(id --name --user):$(id --name --group) UserID $(id --name --user):$(id --name --group)
debugLevel 5 debugLevel 5
EOF
cat > "$keytype.stable.verify.conf" <<EOF
Socket unix:$keytype.stable.verify.sock
PidFile $keytype.stable.verify.pid
Mode v
DNSOverride $(cat testkey.$keytype.dns)
UserID $(id --name --user):$(id --name --group)
EOF EOF
cat > "$keytype.table.conf" <<EOF cat > "$keytype.table.conf" <<EOF
@@ -67,6 +76,14 @@ UserID $(id --name --user):$(id --name --group)
debugLevel 5 debugLevel 5
EOF EOF
cat > "$keytype.table.verify.conf" <<EOF
Socket unix:$keytype.stable.verify.sock
PidFile $keytype.table.verify.pid
Mode v
DNSOverride $(cat testkey.$keytype.dns)
UserID $(id --name --user):$(id --name --group)
EOF
cat > "$keytype-table" <<EOF cat > "$keytype-table" <<EOF
example.org, testnokey, testkey.$keytype.key example.org, testnokey, testkey.$keytype.key
example.net, testkey, testkey.$keytype.key example.net, testkey, testkey.$keytype.key
@@ -81,7 +98,7 @@ cleanup() {
echo cleaning up jobs: echo cleaning up jobs:
jobs jobs
for keytype in "${KEY_TYPES[@]}"; do for keytype in "${KEY_TYPES[@]}"; do
for func in signing verify stable table; do for func in signing verify stable stable.verify table table.verify; do
if [ -s "$keytype.$func.pid" ] && kill -0 "$(cat "$keytype.$func.pid")"; then if [ -s "$keytype.$func.pid" ] && kill -0 "$(cat "$keytype.$func.pid")"; then
kill "$(cat $keytype.$func.pid)" kill "$(cat $keytype.$func.pid)"
fi fi
@@ -89,7 +106,7 @@ cleanup() {
done done
wait wait
for keytype in "${KEY_TYPES[@]}"; do for keytype in "${KEY_TYPES[@]}"; do
for func in signing verify stable table; do for func in signing verify stable stable.verify table table.verify; do
errdata="$keytype.$func.stderr" errdata="$keytype.$func.stderr"
if [ -s "$errdata" ]; then if [ -s "$errdata" ]; then
printf -- "-> %s:\n" "$errdata" printf -- "-> %s:\n" "$errdata"
@@ -102,7 +119,7 @@ cleanup() {
} }
for keytype in "${KEY_TYPES[@]}"; do for keytype in "${KEY_TYPES[@]}"; do
for func in signing verify stable table; do for func in signing verify stable stable.verify table table.verify; do
PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" "$keytype.$func.conf" 2>"$keytype.$func.stderr" & PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" "$keytype.$func.conf" 2>"$keytype.$func.stderr" &
done done
done done