Whoops, turns out I originally ran this test with XOAUTH set. Fix the

output and make sure the common script unsets XOAUTH so this doesn't
happen again.

diff --git a/test/common.sh.in b/test/common.sh.in
index b2c7a7d71b5ba548bd7bcba37364cfdd49d82337..4843a2409cdfd427ffa789924f93b972e8264ca5 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -44,7 +44,7 @@ HOME=$MH_TEST_DIR
 export HOME
 
 unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE
 export HOME
 
 unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE

-unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER
+unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER XOAUTH

 #### Set LC_ALL in individual tests as needed.  Unset these so
 #### that we don't depend on user's settings in other tests.
 unset LANG LC_ALL LC_CTYPE
 #### Set LC_ALL in individual tests as needed.  Unset these so
 #### that we don't depend on user's settings in other tests.
 unset LANG LC_ALL LC_CTYPE

diff --git a/test/send/test-sendfrom b/test/send/test-sendfrom
index 7333d1bdc3df9428a917ff9609cfbcd9075c2ba6..8e55f7ab8fc17a749d9a026de174466a074055b8 100755 (executable)
--- a/test/send/test-sendfrom
+++ b/test/send/test-sendfrom
@@ -55,8 +55,7 @@ Trying to connect to "127.0.0.1" ...
 Connecting to 127.0.0.1:${localport}...
 <= 220 Not really an ESMTP server
 => EHLO nosuchhost.example.com
 Connecting to 127.0.0.1:${localport}...
 <= 220 Not really an ESMTP server
 => EHLO nosuchhost.example.com

-<= 250-ready
-<= 250 AUTH XOAUTH2
+<= 250 I'll buy that for a dollar!

 => MAIL FROM:<nobody@example.com>
 <= 250 I'll buy that for a dollar!
 => RCPT TO:<somebody@example.com>
 => MAIL FROM:<nobody@example.com>
 <= 250 I'll buy that for a dollar!
 => RCPT TO:<somebody@example.com>