X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/aaf70a50e13231ba06df17d79147ac0d7fed6d91..e6d87a04919616cf2a6ea6cbda81d5fbc31cc8a2:/test/oauth/common.sh diff --git a/test/oauth/common.sh b/test/oauth/common.sh index 3f3dc598..d2ac2a27 100644 --- a/test/oauth/common.sh +++ b/test/oauth/common.sh @@ -131,7 +131,7 @@ expect_creds() { } test_inc() { - run_test "inc -host 127.0.0.1 -port ${pop_port} -saslmech xoauth2 -authservice test -user nobody@example.com -width 80" "$@" + run_test "inc -host 127.0.0.1 -port ${pop_port} -sasl -saslmech xoauth2 -authservice test -user nobody@example.com -width 80" "$@" } test_inc_success() { @@ -142,7 +142,7 @@ test_inc_success() { } test_send_no_servers() { - run_test "send -draft -server 127.0.0.1 -port ${smtp_port} -saslmech xoauth2 -authservice test -user nobody@example.com" "$@" + run_test "send -draft -server 127.0.0.1 -port ${smtp_port} -sasl -saslmech xoauth2 -authservice test -user nobody@example.com" "$@" } test_send_only_fakesmtp() { @@ -180,7 +180,7 @@ check_creds() { # it against our "correct" output. f="${MHTMPDIR}/oauth-test" - sed 's/^expire:.*/expire:/' "$f" > "$f".notime + sed 's/^\(expire.*:\).*/\1/' "$f" > "$f".notime check "$f".notime "${MHTMPDIR}/$$.expected-creds" rm "$f" }