aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2009-12-25 22:21:46 +0000
committerDaniel Stenberg <daniel@haxx.se>2009-12-25 22:21:46 +0000
commit73ad32e1252af34de0df8ae0c41bc0694cff9e47 (patch)
tree979148dbd5ec394b6eeea922d15a5e1ac9900818
parent77625f8560429ac58aeb503ec833cf31340f4739 (diff)
When verifying the SMTP server I had to add some hackery since SMTP in itself
doesn't really return any body data to check so I made SMTP check "headers" as well.
-rwxr-xr-xtests/runtests.pl14
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 189d64cab..3ae949892 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -624,15 +624,23 @@ sub verifyftp {
my $time=time();
my $extra;
if($proto eq "ftps") {
- $extra = "--insecure --ftp-ssl-control ";
+ $extra .= "--insecure --ftp-ssl-control ";
+ }
+ elsif($proto eq "smtp") {
+ # SMTP is a bit different since it requires more options and it
+ # has _no_ output!
+ $extra .= "--mail-rcpt verifiedserver ";
+ $extra .= "--mail-from fake ";
+ $extra .= "--user localhost:unused ";
+ $extra .= "--upload /dev/null ";
+ $extra .= "--stderr - "; # move stderr to parse the verbose stuff
}
my $cmd="$VCURL --max-time $server_response_maxtime --silent --verbose --globoff $extra\"$proto://$ip:$port/verifiedserver\" 2>$LOGDIR/verifyftp";
# check if this is our server running on this port:
my @data=runclientoutput($cmd);
logmsg "RUN: $cmd\n" if($verbose);
- my $line;
- foreach $line (@data) {
+ foreach my $line (@data) {
if ( $line =~ /WE ROOLZ: (\d+)/ ) {
# this is our test server with a known pid!
$pid = 0+$1;