cvs commit: qpsmtpd/t/plugin_tests dnsbl

cvsuser     04/09/08 14:53:29

  Modified:    t/Test   Qpsmtpd.pm
               t/Test/Qpsmtpd Plugin.pm
               t/plugin_tests dnsbl
  Log:
  Apparently diag() doesn't do what I thought it did!
  
  Revision  Changes    Path
  1.5       +1 -1      qpsmtpd/t/Test/Qpsmtpd.pm
  
  Index: Qpsmtpd.pm
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/t/Test/Qpsmtpd.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- Qpsmtpd.pm	8 Sep 2004 21:48:27 -0000	1.4
  +++ Qpsmtpd.pm	8 Sep 2004 21:53:29 -0000	1.5
  @@ -78,7 +78,7 @@
       my ($self, $trace, @log) = @_;
       my $level = Qpsmtpd::TRACE_LEVEL();
       $level = $self->init_logger unless defined $level;
  -    diag(join(" ", $$, @log)) if $trace <= $level;
  +    print("# " . join(" ", $$, @log) . "\n") if $trace <= $level;
   }
   
   # sub run
  
  
  
  1.3       +2 -2      qpsmtpd/t/Test/Qpsmtpd/Plugin.pm
  
  Index: Plugin.pm
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/t/Test/Qpsmtpd/Plugin.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- Plugin.pm	8 Sep 2004 21:48:27 -0000	1.2
  +++ Plugin.pm	8 Sep 2004 21:53:29 -0000	1.3
  @@ -1,4 +1,4 @@
  -# $Id: Plugin.pm,v 1.2 2004/09/08 21:48:27 msergeant Exp $
  +# $Id: Plugin.pm,v 1.3 2004/09/08 21:53:29 msergeant Exp $
   
   package Test::Qpsmtpd::Plugin;
   1;
  @@ -33,7 +33,7 @@
       my ($plugin, $qp) = @_;
       foreach my $t (@{$plugin->{_tests}}) {
           my $method = $t->{name};
  -        diag "Running $method tests for plugin " . $plugin->plugin_name;
  +        print "# Running $method tests for plugin " . $plugin->plugin_name . "\n";
           local $plugin->{_qp} = $qp;
           $plugin->$method();
       }
  
  
  
  1.2       +1 -1      qpsmtpd/t/plugin_tests/dnsbl
  
  Index: dnsbl
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/t/plugin_tests/dnsbl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- dnsbl	8 Sep 2004 21:48:27 -0000	1.1
  +++ dnsbl	8 Sep 2004 21:53:29 -0000	1.2
  @@ -21,5 +21,5 @@
       
       my ($ret, $note) = $self->rcpt_handler($self->qp->transaction, '[email protected]');
       is($ret, DENY, "Check we got a DENY");
  -    diag("dnsbl result: $note");
  +    print("# dnsbl result: $note\n");
   }