X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=tests%2FHTTPTest.pm;h=0fdcb8f0e4e3b622239be7328f3b3466a0056469;hb=f0438edcf2e34169fb0792119ac9ce10ae35a564;hp=20e9442f01692bfff03e8a6a16f9ca41590360b9;hpb=4ad743db989fbd62e541c15ab3e65c6ac8d7715d;p=wget

diff --git a/tests/HTTPTest.pm b/tests/HTTPTest.pm
old mode 100755
new mode 100644
index 20e9442f..0fdcb8f0
--- a/tests/HTTPTest.pm
+++ b/tests/HTTPTest.pm
@@ -5,9 +5,9 @@ package HTTPTest;
 use strict;
 
 use HTTPServer;
-use Test;
+use WgetTest;
 
-our @ISA = qw(Test);
+our @ISA = qw(WgetTest);
 my $VERSION = 0.01;
 
 
@@ -15,31 +15,41 @@ my $VERSION = 0.01;
     my %_attr_data = ( # DEFAULT
     );
     
-	sub _default_for
-	{
-		my ($self, $attr) = @_;
+    sub _default_for
+    {
+        my ($self, $attr) = @_;
         return $_attr_data{$attr} if exists $_attr_data{$attr};
-		return $self->SUPER::_default_for($attr);
-	}
+        return $self->SUPER::_default_for($attr);
+    }
 
-	sub _standard_keys 
-	{
+    sub _standard_keys 
+    {
         my ($self) = @_;
-		($self->SUPER::_standard_keys(), keys %_attr_data);
-	}
+        ($self->SUPER::_standard_keys(), keys %_attr_data);
+    }
 }
     
 
-sub _setup_server {}
+sub _setup_server {
+    my $self = shift;
+    $self->{_server} = HTTPServer->new (LocalAddr => 'localhost',
+                                        ReuseAddr => 1)
+                                    or die "Cannot create server!!!";
+}
 
 
 sub _launch_server {
     my $self = shift;
+    my $synch_func = shift;
 
-    my $server = HTTPServer->new (LocalAddr => 'localhost',
-                                  LocalPort => '8080',
-                                  ReuseAddr => 1) or die "Cannot create server!!!";
-    $server->run ($self->{_input});
+    $self->{_server}->run ($self->{_input}, $synch_func);
+}
+
+sub _substitute_port {
+    my $self = shift;
+    my $ret = shift;
+    $ret =~ s/{{port}}/$self->{_server}->sockport/eg;
+    return $ret;
 }
 
 1;