[popfile-commit] engine/tests TestPOP3.tst,1.12,1.13

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv16226/tests

Modified Files:
	TestPOP3.tst 
Log Message:
Bring Bayes tests up to 100% coverage by adding testing of the X-POPFile-TimeoutPrevention header

Index: TestPOP3.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestPOP3.tst,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TestPOP3.tst	23 Aug 2003 19:01:39 -0000	1.12
--- TestPOP3.tst	28 Aug 2003 17:54:55 -0000	1.13
***************
*** 81,84 ****
--- 81,85 ----
      my ( $client ) = @_;
      my @messages = sort glob 'TestMailParse*.msg';
+     my $goslow = 0;
  
      print $client "+OK Ready$eol";
***************
*** 91,96 ****
  
          if ( $command =~ /^USER (.*)/i ) {
! 	    if ( $1 =~ /(gooduser)/ ) {
                   print $client "+OK Welcome $1$eol";
  	    } else {
                   print $client "-ERR Unknown user $1$eol";
--- 92,98 ----
  
          if ( $command =~ /^USER (.*)/i ) {
! 	    if ( $1 =~ /(gooduser|goslow)/ ) {
                   print $client "+OK Welcome $1$eol";
+                  $goslow = ( $1 =~ /goslow/ );
  	    } else {
                   print $client "-ERR Unknown user $1$eol";
***************
*** 179,182 ****
--- 181,187 ----
                   while ( <FILE> ) {
                       print $client $_;
+                      if ( $goslow ) {
+                          select( undef, undef, undef, 3 );
+ 		     }
  		 }
                   close FILE;
***************
*** 902,905 ****
--- 907,960 ----
          close FILE;
  
+         $result = <$client>;
+         test_assert_equal( $result, ".$eol" );
+ 
+         print $client "QUIT$eol";
+         $result = <$client>;
+         test_assert_equal( $result, "+OK Bye$eol" );
+ 
+         close $client;
+ 
+         # Check insertion of the X-POPFile-Timeout headers
+ 
+         my $client = IO::Socket::INET->new(
+                         Proto    => "tcp",
+                         PeerAddr => 'localhost',
+                         PeerPort => $port );
+ 
+         test_assert( defined( $client ) );
+         test_assert( $client->connected );
+ 
+         my $result = <$client>;
+         test_assert_equal( $result, "+OK POP3 POPFile (test suite) server ready$eol" );
+ 
+         print $client "USER 127.0.0.1:8110:goslow$eol";
+         $result = <$client>;
+         test_assert_equal( $result, "+OK Welcome goslow$eol" );
+ 
+         print $client "RETR 1$eol";
+         $result = <$client>;
+         test_assert_equal( $result, "+OK " . ( -s $messages[0] ) . "$eol" );
+         my $cam = $messages[0];
+         $cam =~ s/msg$/cam/;
+ 
+         test_assert( open FILE, "<$cam" );
+         binmode FILE;
+         $line = <$client>;
+         test_assert_equal( $line, "X-POPFile-TimeoutPrevention: 0$eol" );
+         $line = <$client>;
+         test_assert_equal( $line, "X-POPFile-TimeoutPrevention: 1$eol" );
+         $line = <$client>;
+         test_assert_equal( $line, "X-POPFile-TimeoutPrevention: 2$eol" );
+         while ( <FILE> ) {
+             my $line = $_;
+             $result = <$client>;
+             $result =~ s/popfile3=1/popfile0=0/;
+             test_assert_equal( $result, $line );
+ 	}
+         close FILE;
+ 
+         $result = <$client>;
+         test_assert_equal( $result, "$eol" );
          $result = <$client>;
          test_assert_equal( $result, ".$eol" );