X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=tests%2FFTPTest.pm;h=c1d3d266cf0f692e0d7cad62f8ce9c92c981c767;hp=81b8b008eaa343f3d768e1d20c830fd8472f3e41;hb=320cfdcb658e8d6556ae9dfd902c2db1db866a6b;hpb=d8c11a82ca9e8fab6689b53dc12199da4cc6058d diff --git a/tests/FTPTest.pm b/tests/FTPTest.pm index 81b8b008..c1d3d266 100644 --- a/tests/FTPTest.pm +++ b/tests/FTPTest.pm @@ -21,7 +21,7 @@ my $VERSION = 0.01; return $self->SUPER::_default_for($attr); } - sub _standard_keys + sub _standard_keys { my ($self) = @_; ($self->SUPER::_standard_keys(), keys %_attr_data); @@ -32,19 +32,10 @@ my $VERSION = 0.01; 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!!!"; } @@ -53,6 +44,7 @@ sub _setup_server { sub _launch_server { my $self = shift; my $synch_func = shift; + $self->{_server}->run ($synch_func); }