github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-02-07 18:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Error-checking improvements to WgetTest.pm.

Browse Source
This commit is contained in:
Micah Cowan 2009-09-04 18:32:52 -07:00
parent 1489612dd1
commit 1fe5ddb7fe
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ChangeLog
View File

@ -1,3 +1,7 @@
2009-09-04 Micah Cowan <micah@cowan.name>
* WgetTest.pm.in (run): Error-checking improvements.
2009-09-02 Micah Cowan <micah@cowan.name> 2009-09-02 Micah Cowan <micah@cowan.name>
* Makefile.am (unit-tests): explicit dependency is * Makefile.am (unit-tests): explicit dependency is

16
tests/WgetTest.pm.in
View File

@ -69,12 +69,18 @@ sub new {
sub run { sub run {
my $self = shift; my $self = shift;
my $result_message = "Test successful.\n"; my $result_message = "Test successful.\n";
my $errcode;
printf "Running test $self->{_name}\n"; printf "Running test $self->{_name}\n";
# Setup # Setup
$self->_setup(); my $new_result = $self->_setup();
chdir ("$self->{_workdir}/$self->{_name}/input"); chdir ("$self->{_workdir}/$self->{_name}/input");
if (defined $new_result) {
$result_message = $new_result;
$errcode = 1;
goto cleanup;
}
# Launch server # Launch server
my $pid = $self->_fork_and_launch_server(); my $pid = $self->_fork_and_launch_server();
@ -84,7 +90,7 @@ sub run {
my $cmdline = $self->{_cmdline}; my $cmdline = $self->{_cmdline};
$cmdline = $self->_substitute_port($cmdline); $cmdline = $self->_substitute_port($cmdline);
print "Calling $cmdline\n"; print "Calling $cmdline\n";
my $errcode = $errcode =
($cmdline =~ m{^/.*}) ($cmdline =~ m{^/.*})
? system ($cmdline) ? system ($cmdline)
: system ("$self->{_workdir}/../src/$cmdline"); : system ("$self->{_workdir}/../src/$cmdline");
@ -99,13 +105,14 @@ sub run {
# Verify download # Verify download
unless ($errcode == $self->{_errcode}) { unless ($errcode == $self->{_errcode}) {
$result_message = "Test failed: wrong code returned (was: $errcode, expected: $self->{_errcode})\n"; $result_message = "Test failed: wrong code returned (was: $errcode, expected: $self->{_errcode})\n";
goto cleanup;
} }
my $error_str; my $error_str;
if ($error_str = $self->_verify_download()) { if ($error_str = $self->_verify_download()) {
$result_message = $error_str; $result_message = $error_str;
} }
# Cleanup cleanup:
$self->_cleanup(); $self->_cleanup();
print $result_message; print $result_message;
@ -144,9 +151,10 @@ sub _setup {
} }
chdir ("../input"); chdir ("../input");
$self->_setup_server(); my $ret = $self->_setup_server();
chdir ($self->{_workdir}); chdir ($self->{_workdir});
return $ret;
} }