[smolder-commits] SF.net SVN: smolder:[895] trunk/lib/Smolder

[<mic...@us...>]

Revision: 895
          http://smolder.svn.sourceforge.net/smolder/?rev=895&view=rev
Author:   michael_peters
Date:     2009-03-30 00:19:55 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
make sure emails dont go out during testing

Modified Paths:
--------------
    trunk/lib/Smolder/Build.pm
    trunk/lib/Smolder/Email.pm

Modified: trunk/lib/Smolder/Build.pm
===================================================================
--- trunk/lib/Smolder/Build.pm	2009-03-30 00:06:34 UTC (rev 894)
+++ trunk/lib/Smolder/Build.pm	2009-03-30 00:19:55 UTC (rev 895)
@@ -59,6 +59,7 @@
     print $tmp_conf $conf;
     close $tmp_conf;
     $ENV{SMOLDER_CONF} = $tmp_conf->filename;
+    $ENV{SMOLDER_TEST_HARNESS_ARCHIVE} = 1; 
 
     # start the smolder server
     my ($in, $out, $err);

Modified: trunk/lib/Smolder/Email.pm
===================================================================
--- trunk/lib/Smolder/Email.pm	2009-03-30 00:06:34 UTC (rev 894)
+++ trunk/lib/Smolder/Email.pm	2009-03-30 00:19:55 UTC (rev 895)
@@ -91,11 +91,6 @@
       || croak $TEMPLATE->error();
     my $text = HTML::FormatText::WithLinks->new()->parse($html);
 
-my $fh;
-open($fh, '>', '/tmp/email_full.html') or die $!;
-print $fh $html;
-close $fh;
-
     # create the multipart text and html message
     my $mime = MIME::Lite->new(
         From    => FromAddress(),
@@ -113,10 +108,10 @@
     );
 
     # set the SMTP host
-    if( SMTPHost() ) {
-        MIME::Lite->send( 'smtp', SMTPHost(), Timeout => 60 );
+    unless( $ENV{SMOLDER_TEST_HARNESS_ARCHIVE} ) {
+        MIME::Lite->send( 'smtp', SMTPHost(), Timeout => 60 ) if SMTPHost();
+        eval { $mime->send() };
     }
-    eval { $mime->send() } unless $ENV{SMOLDER_TEST_HARNESS_ACTIVE};
     return $@;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.