From 7867ba61d526a80b5e81e0ba9ab35425108f724e Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Tue, 4 Nov 2008 22:47:05 +0000
Subject: [PATCH] turn off email to log properly for mail tests

---
 t/Mail/Send.t | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/t/Mail/Send.t b/t/Mail/Send.t
index badf328e5..534650485 100644
--- a/t/Mail/Send.t
+++ b/t/Mail/Send.t
@@ -11,7 +11,7 @@
 
 # This script tests the creation, sending, and queuing of mail messages
 # TODO: There is plenty left to do in this script.
-
+$|=1;
 use FindBin;
 use strict;
 use lib "$FindBin::Bin/../lib";
@@ -43,9 +43,8 @@ my $SMTP_PORT        = '54921';
 if ($hasServer) {
     $oldSettings{ smtpServer } = $session->setting->get('smtpServer');
     $session->setting->set( 'smtpServer', $SMTP_HOST . ':' . $SMTP_PORT );
+    
 }
-$oldSettings{ emailToLog } = $session->setting->get('emailToLog');
-$session->setting->set('emailToLog', 0);
 
 #----------------------------------------------------------------------------
 # Tests
@@ -103,7 +102,6 @@ is( $mime->parts(0)->as_string =~ m/\n/, $newlines,
     "addHtml should add newlines after 78 characters",
 );
 
-$mail   = WebGUI::Mail::Send->create( $session );
 # TODO: Test that addHtml does not create an HTML wrapper if html or body tag exist
 
 #----------------------------------------------------------------------------
@@ -144,6 +142,8 @@ SKIP: {
     # Override the emailOverride
     my $oldEmailOverride   = $session->config->get('emailOverride');
     $session->config->set( 'emailOverride', 'dufresne@localhost' );
+    my $oldEmailToLog      = $session->config->get('emailToLog');
+    $session->config->set( 'emailToLog', 0 );
     
     # Send the mail
     my $mail
@@ -165,6 +165,7 @@ SKIP: {
 
     # Restore the emailOverride
     $session->config->set( 'emailOverride', $oldEmailOverride );
+    $session->config->set( 'emailToLog', $oldEmailToLog );
 }
 
 # TODO: Test the emailToLog config setting
@@ -192,7 +193,7 @@ END {
 #                 by a MIME::Entity parser
 sub sendToServer {
     my $mail        = shift;
-    
+
     my $smtpd       = File::Spec->catfile( WebGUI::Test->root, 't', 'smtpd.pl' );
     open MAIL, "perl $smtpd $SMTP_HOST $SMTP_PORT |"
         or die "Could not open pipe to SMTPD: $!";