Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

this workarounds broken Net::FTP libraray or whatever. #1509

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

this workarounds broken Net::FTP libraray or whatever. #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 22 additions & 5 deletions tests/t/lib/ProFTPD/Tests/Commands/STOU.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,14 +397,22 @@ sub stou_ok_file {

my $buf = "Foo!\n";
$conn->write($buf, length($buf));
$conn->close();

my ($resp_code, $resp_msg);
$resp_code = $client->response_code();
$resp_msg = $client->response_msg();

my $expected;
$expected = 150;
$self->assert($expected == $resp_code,
test_msg("Expected $expected, got $resp_code"));
my $uniq_file;
if ($resp_msg =~ /^FILE:\s+(\S+)$/) {
$uniq_file = $1;
}
eval { $conn->close() };

$resp_code = $client->response_code();
$resp_msg = $client->response_msg();
$expected = 226;
$self->assert($expected == $resp_code,
test_msg("Expected $expected, got $resp_code"));
Expand All @@ -413,7 +421,6 @@ sub stou_ok_file {
$self->assert($expected eq $resp_msg,
test_msg("Expected '$expected', got '$resp_msg'"));

my $uniq_file = $client->response_uniq();
$self->assert($uniq_file, test_msg("Expected non-null unique file"));

my $test_file = "$home_dir/$uniq_file";
Expand Down Expand Up @@ -507,13 +514,23 @@ sub stou_file_umask_bug4223 {

my $buf = "Foo!\n";
$conn->write($buf, length($buf), 30);
eval { $conn->close() };

my $resp_code = $client->response_code();
my $resp_msg = $client->response_msg();
my $expected;
$expected = 150;
$self->assert($expected == $resp_code,
test_msg("Expected $expected, got $resp_code"));
my $uniq_file;
if ($resp_msg =~ /^FILE:\s+(\S+)$/) {
$uniq_file = $1;
}
eval { $conn->close() };

$resp_code = $client->response_code();
$resp_msg = $client->response_msg();
$self->assert_transfer_ok($resp_code, $resp_msg);

my $uniq_file = $client->response_uniq();
$self->assert($uniq_file, test_msg("Expected non-null unique file"));

my $test_file = File::Spec->rel2abs("$setup->{home_dir}/$uniq_file");
Expand Down
13 changes: 10 additions & 3 deletions tests/t/lib/ProFTPD/Tests/Config/StoreUniquePrefix.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,22 @@ sub storeuniqueprefix_ok {

my $buf = "Hello, World!\n";
$conn->write($buf, length($buf));
$conn->close();

my $resp_code = $client->response_code();
my $resp_msg = $client->response_msg();

my $expected;
$expected = 150;
$self->assert($expected == $resp_code,
test_msg("Expected $expected, got $resp_code"));
my $uniq_file;
if ($resp_msg =~ /^FILE:\s+(\S+)$/) {
$uniq_file = $1;
}
eval { $conn->close() };

$resp_code = $client->response_code();
$resp_msg = $client->response_msg();
$expected = 226;
$self->assert($expected == $resp_code,
test_msg("Expected $expected, got $resp_code"));
Expand All @@ -128,8 +137,6 @@ sub storeuniqueprefix_ok {
$self->assert($expected eq $resp_msg,
test_msg("Expected '$expected', got '$resp_msg'"));

my $uniq_file = $client->response_uniq();

$client->quit();

$expected = "^$prefix";
Expand Down