You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2011/09/27 02:42:33 UTC
svn commit: r1176141 - in /spamassassin/trunk: sa-check_spamd.raw
t/SATest.pm t/sa_check_spamd.t t/spamd_protocol_10.t t/spamd_unix_and_tcp.t
Author: mmartinec
Date: Tue Sep 27 00:42:33 2011
New Revision: 1176141
URL: http://svn.apache.org/viewvc?rev=1176141&view=rev
Log:
tests: prevent tests from failing on an net6 -only host
Modified:
spamassassin/trunk/sa-check_spamd.raw
spamassassin/trunk/t/SATest.pm
spamassassin/trunk/t/sa_check_spamd.t
spamassassin/trunk/t/spamd_protocol_10.t
spamassassin/trunk/t/spamd_unix_and_tcp.t
Modified: spamassassin/trunk/sa-check_spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-check_spamd.raw?rev=1176141&r1=1176140&r2=1176141&view=diff
==============================================================================
--- spamassassin/trunk/sa-check_spamd.raw (original)
+++ spamassassin/trunk/sa-check_spamd.raw Tue Sep 27 00:42:33 2011
@@ -114,7 +114,7 @@ if (defined $opt{'critical'}) {
}
if (defined $opt{'hostname'}) {
- if ($opt{'hostname'} =~ /^([A-Za-z0-9_.-]+)$/) {
+ if ($opt{'hostname'} =~ /^([A-Za-z0-9_.:-]+)$/) {
$opt{'hostname'} = $1;
} else {
print "SPAMD UNKNOWN: invalid hostname config value provided\n";
Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/SATest.pm?rev=1176141&r1=1176140&r2=1176141&view=diff
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Tue Sep 27 00:42:33 2011
@@ -2,6 +2,10 @@
# imported into main for ease of use.
package main;
+# use strict;
+# use warnings;
+# use re 'taint';
+
use Cwd;
use Config;
use File::Basename;
@@ -15,8 +19,8 @@ BEGIN {
use vars qw(@ISA @EXPORT @EXPORT_OK);
@ISA = qw(Exporter);
- use vars qw($have_inet4 $have_inet6);
- @EXPORT = qw($have_inet4 $have_inet6);
+ use vars qw($have_inet4 $have_inet6 $spamdhost $spamdport);
+ @EXPORT = qw($have_inet4 $have_inet6 $spamdhost $spamdport);
# No spamd test in Windows unless env override says user figured out a way
# If you want to know why these are vars and no constants, read this thread:
@@ -99,7 +103,7 @@ sub sa_t_init {
$spamdlocalhost = $ENV{'SPAMD_LOCALHOST'};
if (!$spamdlocalhost) {
- $spamdlocalhost = $have_net4 || !$have_inet6 ? '127.0.0.1' : '::1';
+ $spamdlocalhost = $have_inet4 || !$have_inet6 ? '127.0.0.1' : '::1';
}
$spamdhost = $ENV{'SPAMD_HOST'};
$spamdhost ||= $spamdlocalhost;
Modified: spamassassin/trunk/t/sa_check_spamd.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_check_spamd.t?rev=1176141&r1=1176140&r2=1176141&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_check_spamd.t (original)
+++ spamassassin/trunk/t/sa_check_spamd.t Tue Sep 27 00:42:33 2011
@@ -21,10 +21,10 @@ ok(spamcrun("< data/spam/001", \&pattern
ok_all_patterns();
my $p = $spamdport;
-system("../sa-check_spamd --hostname 127.0.0.1 --port $p --verbose");
+system("../sa-check_spamd --hostname $spamdhost --port $p --verbose");
ok (($? >> 8) == 0);
ok(stop_spamd());
-system("../sa-check_spamd --hostname 127.0.0.1 --port $p --verbose");
+system("../sa-check_spamd --hostname $spamdhost --port $p --verbose");
ok (($? >> 8) != 0);
Modified: spamassassin/trunk/t/spamd_protocol_10.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_protocol_10.t?rev=1176141&r1=1176140&r2=1176141&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_protocol_10.t (original)
+++ spamassassin/trunk/t/spamd_protocol_10.t Tue Sep 27 00:42:33 2011
@@ -53,13 +53,16 @@ exit;
sub run_symbols {
my($data, $proto10) = @_;
-
- $socket = new IO::Socket::INET(
- PeerAddr => $spamdhost,
- PeerPort => $spamdport,
- Proto => "tcp",
- Type => SOCK_STREAM
- );
+ my $use_inet4 =
+ !$have_inet6 ||
+ ($have_inet4 && $spamdhost =~ /^\d+\.\d+\.\d+\.\d+\z/);
+ my %args = ( PeerAddr => $spamdhost,
+ PeerPort => $spamdport,
+ Proto => "tcp",
+ Type => SOCK_STREAM
+ );
+ $socket = $use_inet4 ? IO::Socket::INET->new(%args)
+ : IO::Socket::INET6->new(%args);
unless ($socket) {
warn("FAILED - Couldn't Connect to SpamCheck Host\n");
return undef;
Modified: spamassassin/trunk/t/spamd_unix_and_tcp.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_unix_and_tcp.t?rev=1176141&r1=1176140&r2=1176141&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_unix_and_tcp.t (original)
+++ spamassassin/trunk/t/spamd_unix_and_tcp.t Tue Sep 27 00:42:33 2011
@@ -10,7 +10,7 @@ exit unless (!$SKIP_SPAMD_TESTS && !$RUN
# ---------------------------------------------------------------------------
my $sockpath = mk_safe_tmpdir()."/spamd.sock";
-start_spamd("-D -L --socketpath=$sockpath --port $spamdport");
+start_spamd("-D -L --socketpath=$sockpath --port $spamdport -A $spamdhost -i $spamdhost");
%patterns = (
q{ Subject: There yours for FREE!}, 'subj',
q{ X-Spam-Flag: YES}, 'flag',