nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-09-23 06:39:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support multiple SCRIPT= lines in a regression test.

Browse Source
This commit is contained in:
Andrew McMillan 2011-09-23 13:02:28 +12:00
parent b6f2f9c7da
commit 5d3b265ba5
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
testing/dav_test
View File

@ -46,6 +46,8 @@ push @arguments, "--silent" unless ( $debug );
push @arguments, "--verbose" if ( $debug ); push @arguments, "--verbose" if ( $debug );
my $url; my $url;
my $script;
my @scripts = ( );
my $is_head_request = 0; my $is_head_request = 0;
my @auth = ( "--user", "user1:user1" ); my @auth = ( "--user", "user1:user1" );
@ -182,14 +184,18 @@ while( <TEST> ) {
$url =~ s{alternate.host}{$althost}; $url =~ s{alternate.host}{$althost};
}; };
$line =~ /^\s*SCRIPT\s*=\s*(\S.*)$/ && do {
$script=$1;
$script =~ s{regression.host}{$webhost};
$script =~ s{alternate.host}{$althost};
push @scripts, $script;
};
} }
if ( !defined($url) ) { if ( !defined($url) && !defined($script) ) {
print <<EOERROR ; print <<EOERROR ;
The .test file must contain a URL. It may also contain a TYPE line (to The .test file must contain either a URL or a SCRIPT.
specify the request type, such as PROPFIND, MKCOL, PUT etc) and it may
contain a number of HEADER lines to specify additional headers to send
along with the request.
EOERROR EOERROR
exit (2); exit (2);
} }
@ -209,17 +215,32 @@ else {
} }
push @arguments, $url; if ( defined($url) ) {
push @arguments, $url;
print STDERR join " ", "curl", @arguments, "\n" if ( $debug ); print STDERR join " ", "curl", @arguments, "\n" if ( $debug );
open RESULTS, "-|", "curl", @arguments; open RESULTS, "-|", "curl", @arguments;
while( <RESULTS> ) { while( <RESULTS> ) {
my $line = $_; my $line = $_;
foreach my $replacement ( @$replacements ) { foreach my $replacement ( @$replacements ) {
$line =~ s/$replacement->{'pattern'}/$replacement->{'replacement'}/; $line =~ s/$replacement->{'pattern'}/$replacement->{'replacement'}/;
}
print $line;
}
}
if ( defined($script) ) {
foreach $script ( @scripts ) {
open RESULTS, "-|", $script;
while( <RESULTS> ) {
my $line = $_;
foreach my $replacement ( @$replacements ) {
$line =~ s/$replacement->{'pattern'}/$replacement->{'replacement'}/;
}
print $line;
}
} }
print $line;
} }
if ( defined(@{$queries}) && @{$queries} ) { if ( defined(@{$queries}) && @{$queries} ) {