several adjustments for tests

This commit is contained in:
Matt Simerson 2012-11-16 20:03:10 -05:00
parent b89272c480
commit f56c200e91
4 changed files with 12 additions and 1 deletions

View File

@ -1,5 +1,14 @@
# Format is IP, or IP part with trailing dot # used by plugins/relay
# IPv4 format is IP, or IP part with trailing dot
# e.g. "127.0.0.1", or "192.168." # e.g. "127.0.0.1", or "192.168."
127.0.0.1 127.0.0.1
# leading/trailing whitespace is ignored # leading/trailing whitespace is ignored
192.0. 192.0.
#
# IPv6 formats can be compressed or expanded, may include a prefixlen,
# and can end on any nibble boundary. Nibble boundaries must be expressed
# in expanded format. (RFC 3849 example)
2001:0DB8
2001:DB8::1
2001:DB8::1/32
2001:0DB8:0000:0000:0000:0000:0000:0001

View File

@ -22,6 +22,7 @@ sub test_log_and_return {
my $transaction = $self->qp->transaction; my $transaction = $self->qp->transaction;
# reject not set # reject not set
$self->{_args}{reject} = undef;
$transaction->notes('dspam', { class=> 'Spam', probability => .99, confidence=>1 } ); $transaction->notes('dspam', { class=> 'Spam', probability => .99, confidence=>1 } );
($r) = $self->log_and_return( $transaction ); ($r) = $self->log_and_return( $transaction );
cmp_ok( $r, '==', DECLINED, "($r)"); cmp_ok( $r, '==', DECLINED, "($r)");

View File

@ -86,6 +86,7 @@ sub test_hook_data_post {
my $transaction = $self->qp->transaction; my $transaction = $self->qp->transaction;
my ($code, $mess) = $self->hook_data_post( $transaction ); my ($code, $mess) = $self->hook_data_post( $transaction );
$mess ||= ''; # avoid undef warning
cmp_ok( DECLINED, '==', $code, "okay $code, $mess" ); cmp_ok( DECLINED, '==', $code, "okay $code, $mess" );
$transaction->header->delete('Date'); $transaction->header->delete('Date');