X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=tests%2FFTPTest.pm;h=a820ef51a6ec3a25e0c50d0a119a91540113f668;hp=eed2eb89e930df48128d1e36781a7dbe0249b20a;hb=aab7dadc9a4f55d3a7921a2844ba1bbc18f7fc10;hpb=2e2ac6ad2fc90eaf46ae5fee0bc4f61dd97b4284

diff --git a/tests/FTPTest.pm b/tests/FTPTest.pm
index eed2eb89..a820ef51 100644
--- a/tests/FTPTest.pm
+++ b/tests/FTPTest.pm
@@ -1,8 +1,7 @@
-#!/usr/bin/perl -w
-
 package FTPTest;
 
 use strict;
+use warnings;
 
 use FTPServer;
 use WgetTest;
@@ -14,7 +13,7 @@ my $VERSION = 0.01;
 {
     my %_attr_data = ( # DEFAULT
     );
-    
+
     sub _default_for
     {
         my ($self, $attr) = @_;
@@ -28,24 +27,15 @@ my $VERSION = 0.01;
         ($self->SUPER::_standard_keys(), keys %_attr_data);
     }
 }
-    
+
 
 sub _setup_server {
     my $self = shift;
 
-    foreach my $url (keys %{$self->{_input}}) {
-        my $filename = $url;
-        $filename =~ s/^\///;
-        open (FILE, ">$filename")
-            or return "Test failed: cannot open input file $filename\n";
-
-        print FILE $self->{_input}->{$url}->{content}
-            or return "Test failed: cannot write input file $filename\n";
-
-        close (FILE);
-    }
-
-    $self->{_server} = FTPServer->new (LocalAddr => 'localhost',
+    $self->{_server} = FTPServer->new (input => $self->{_input},
+                                       server_behavior =>
+                                           $self->{_server_behavior},
+                                       LocalAddr => 'localhost',
                                        ReuseAddr => 1,
                                        rootDir => "$self->{_workdir}/$self->{_name}/input") or die "Cannot create server!!!";
 }
@@ -54,6 +44,7 @@ sub _setup_server {
 sub _launch_server {
     my $self = shift;
     my $synch_func = shift;
+
     $self->{_server}->run ($synch_func);
 }