cvs commit: modperl-2.0/Apache-Test/lib/Apache TestServer.pm TestRun.pm

[sbekman]

sbekman     01/06/24 01:34:34

  Modified:    Apache-Test/lib/Apache TestServer.pm TestRun.pm
  Log:
  move the warning into TestRun, otherwise it break start()
  
  Revision  Changes    Path
  1.9       +0 -3      modperl-2.0/Apache-Test/lib/Apache/TestServer.pm
  
  Index: TestServer.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Apache-Test/lib/Apache/TestServer.pm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestServer.pm     2001/06/24 08:15:21     1.8
  +++ TestServer.pm     2001/06/24 08:34:34     1.9
  @@ -158,9 +158,6 @@
   
       my $port = $self->{config}->{vars}->{port};
   
  -    warning("server $self->{name} is not running"),
  -        return -1 unless $self->ping;
  -
       while ($self->ping) {
           #my $state = $tried_kill ? "still" : "already";
           #print "Port $port $state in use\n";
  
  
  
  1.9       +5 -1      modperl-2.0/Apache-Test/lib/Apache/TestRun.pm
  
  Index: TestRun.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Apache-Test/lib/Apache/TestRun.pm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestRun.pm        2001/06/21 08:09:43     1.8
  +++ TestRun.pm        2001/06/24 08:34:34     1.9
  @@ -222,7 +222,11 @@
       }
   
       if ($self->{opts}->{'stop-httpd'}) {
  -        $self->{server}->stop;
  +        if ($self->{server}->ping) {
  +            $self->{server}->stop;
  +        } else {
  +            warning "server $self->{server}->{name} is not running";
  +        }
           exit;
       }
   }