[Rt-commit] r10701 - in rt/branches/3.999-DANGEROUS: lib/RT/Crypt t/mail

[jesse at bestpractical.com]

Author: jesse
Date: Sun Feb  3 18:05:41 2008
New Revision: 10701

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm
   rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t

Log:
 r76151 at pinglin:  jesse | 2008-02-03 18:04:01 -0500
 t/mail/crypt-gnupg.t now passes


Modified: rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm	Sun Feb  3 18:05:41 2008
@@ -502,7 +502,6 @@
             waitpid $pid, 0;
         };
         my $err       = $@;
-        warn "Error was $err";
         my @signature = readline $handle{'output'};
         close $handle{'output'};
 
@@ -513,7 +512,7 @@
             close $handle{$_};
         }
         Jifty->log->debug( $res{'status'} ) if $res{'status'};
-        Jifty->log->warn( "EEEEE". $res{'error'} )   if $res{'error'};
+        Jifty->log->warn(  $res{'error'} )   if $res{'error'};
         Jifty->log->error( $res{'logger'} ) if $res{'logger'} && $?;
         if ( $err || $res{'exit_code'} ) {
             $res{'message'} = $err ? $err : "gpg exitted with error code " . ( $res{'exit_code'} >> 8 );
@@ -574,7 +573,7 @@
             close $handle{$_};
         }
         Jifty->log->debug( $res{'status'} ) if $res{'status'};
-        Jifty->log->warn( "EE". $res{'error'} )   if $res{'error'};
+        Jifty->log->warn(  $res{'error'} )   if $res{'error'};
         Jifty->log->error( $res{'logger'} ) if $res{'logger'} && $?;
         if ( $@ || $? ) {
             $res{'message'}

Modified: rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t	Sun Feb  3 18:05:41 2008
@@ -137,7 +137,7 @@
 
     my @status = RT::Crypt::GnuPG::parse_status( $res{'status'} );
     is( scalar @status, 1, 'one record');
-    is( $status[0]->{'Keyword'}, 'INV_RECP', 'invalid recipient');
+    is( $status[0]->{'keyword'}, 'INV_RECP', 'invalid recipient');
 }
 
 diag 'encryption and signing with combined method' if $ENV{'TEST_VERBOSE'};