[Http-webtest-commits] CVS: HTTP-WebTest/t 11-delay.t,1.1,1.2

[Ilya M. <m_...@us...>]

Update of /cvsroot/http-webtest/HTTP-WebTest/t
In directory usw-pr-cvs1:/tmp/cvs-serv18535

Modified Files:
	11-delay.t 
Log Message:
Minor fixes


Index: 11-delay.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/11-delay.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 11-delay.t	19 Jun 2002 10:29:32 -0000	1.1
--- 11-delay.t	25 Jul 2002 08:33:16 -0000	1.2
***************
*** 29,40 ****
  
  {
      if(defined $ENV{TEST_FAST}) {
! 	skip('skip: delay tests are disabled', 1);
! 	skip('skip: delay tests are disabled', 1);
      } else {
  	my $start = gettimeofday;
  
  	my $tests = [ { url => abs_url($URL, '/test'),
! 			delay => 1 } ];
  
  	check_webtest(webtest => $WEBTEST,
--- 29,53 ----
  
  {
+     # run non-empty test once to trigger loading of all modules;
+     # otherwise next test run takes too much time (because of module
+     # loading) and breaks delay test
+ 
+     my $output = '';
+ 
+     $WEBTEST->run_tests([ { url => abs_url($URL, '/test') } ],
+ 			{ %$OPTS,
+ 			  output_ref => \$output });
+ }
+ 
+ {
      if(defined $ENV{TEST_FAST}) {
! 	for (1..2) {
! 	    skip('skip: delay tests are disabled', 1);
! 	}
      } else {
  	my $start = gettimeofday;
  
  	my $tests = [ { url => abs_url($URL, '/test'),
! 			delay => 2 } ];
  
  	check_webtest(webtest => $WEBTEST,
***************
*** 44,49 ****
  		      check_file => 't/test.out/delay');
  
! 	my $delay = int(((gettimeofday - $start) * 10 + 0.10) / 10);
! 	ok($delay == 1);
      }
  }
--- 57,62 ----
  		      check_file => 't/test.out/delay');
  
! 	my $delay = gettimeofday - $start;
! 	ok(1 < $delay and $delay < 3);
      }
  }
***************
*** 51,61 ****
  {
      if(defined $ENV{TEST_FAST}) {
! 	skip('skip: delay tests are disabled', 1);
! 	skip('skip: delay tests are disabled', 1);
      } else {
  	my $start = gettimeofday;
  
  	my $tests = [ { url => abs_url($URL, '/test'),
! 			delay => 2 } ];
  
  	check_webtest(webtest => $WEBTEST,
--- 64,75 ----
  {
      if(defined $ENV{TEST_FAST}) {
! 	for (1..2) {
! 	    skip('skip: delay tests are disabled', 1);
! 	}
      } else {
  	my $start = gettimeofday;
  
  	my $tests = [ { url => abs_url($URL, '/test'),
! 			delay => 4 } ];
  
  	check_webtest(webtest => $WEBTEST,
***************
*** 65,70 ****
  		      check_file => 't/test.out/delay');
  
! 	my $delay = int(((gettimeofday - $start) * 10 + 0.10) / 10);
! 	ok($delay == 2);
      }
  }
--- 79,84 ----
  		      check_file => 't/test.out/delay');
  
! 	my $delay = gettimeofday - $start;
! 	ok(3 < $delay and $delay < 5);
      }
  }