svn commit: r808126 - /spamassassin/trunk/t/dkim2.t

[mm...@apache.org]

Author: mmartinec
Date: Wed Aug 26 16:59:39 2009
New Revision: 808126

URL: http://svn.apache.org/viewvc?rev=808126&view=rev
Log:
t/dkim2.t: add a test for DKIM_ADSP_NXDOMAIN;
tell (to STDERR) about expected failures in older
versions of Mail::DKIM

Modified:
    spamassassin/trunk/t/dkim2.t

Modified: spamassassin/trunk/t/dkim2.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dkim2.t?rev=808126&r1=808125&r2=808126&view=diff
==============================================================================
--- spamassassin/trunk/t/dkim2.t (original)
+++ spamassassin/trunk/t/dkim2.t Wed Aug 26 16:59:39 2009
@@ -10,13 +10,12 @@
 
 use vars qw(%patterns %anti_patterns);
 
-use constant num_tests => 122;
+use constant num_tests => 123;
 
 use constant TEST_ENABLED => conf_bool('run_net_tests');
 use constant HAS_MODULES => eval {
-  require Mail::DKIM;
   require Mail::DKIM::Verifier;
-  $Mail::DKIM::VERSION >= 0.31;
+  Mail::DKIM::Verifier->VERSION >= 0.31;
 };
 
 use constant DO_RUN => TEST_ENABLED && HAS_MODULES;
@@ -74,8 +73,8 @@
 sub test_samples($$) {
   my($test_filenames, $patt_antipatt_list) = @_;
   for my $fn (sort { $a cmp $b } @$test_filenames) {
-    my $el = @$patt_antipatt_list > 1 ? shift @$patt_antipatt_list
-                                      : $patt_antipatt_list->[0];
+    my $el = $patt_antipatt_list->[0];
+    shift @$patt_antipatt_list if @$patt_antipatt_list > 1; # last autorepeats
     my($patt,$anti) = split(m{\s* / \s*}x, $el, 2);
     %patterns      = map { (" $_ ", $_) } split(' ',$patt);
     %anti_patterns = map { (" $_ ", $_) } split(' ',$anti);
@@ -118,7 +117,8 @@
 ok($spamassassin_obj);
 $spamassassin_obj->compile_now;  # try to preloaded most modules
 
-printf("Using Mail::DKIM version %s\n", Mail::DKIM::Verifier->VERSION);
+my $version = Mail::DKIM::Verifier->VERSION;
+print "Using Mail::DKIM version $version\n";
 
 # mail samples test-pass* should all pass DKIM validation
 my($fn, @test_filenames, @patt_antipatt_list);
@@ -171,10 +171,19 @@
   'DKIM_ADSP_DISCARD  / DKIM_VALID DKIM_ADSP_NXDOMAIN DKIM_ADSP_ALL', # 19 dis
   'DKIM_ADSP_DISCARD  / DKIM_VALID DKIM_ADSP_NXDOMAIN DKIM_ADSP_ALL', # 20 di2
   'DKIM_ADSP_DISCARD  / DKIM_VALID DKIM_ADSP_ALL',                    # 21 nxd
-  '                   / DKIM_VALID DKIM_ADSP_DISCARD DKIM_ADSP_ALL',  # 22 xxx
+  'DKIM_ADSP_NXDOMAIN / DKIM_VALID DKIM_ADSP_DISCARD  DKIM_ADSP_ALL', # 22 xxx
 );
 test_samples(\@test_filenames, \@patt_antipatt_list);
 
+STDOUT->autoflush(1);
+if ($version < 0.34) {
+  print STDERR "\n\n*** Mail::DKIM $version, Tests 105, 109, 113, 117, 120 ".
+               "are expected to fail with versions older than 0.34\n";
+} elsif ($version < 0.37) {
+  print STDERR "\n\n*** Mail::DKIM $version, Test 120 ".
+               "is expected to fail with versions older than 0.36_5\n";
+}
+
 END {
   $spamassassin_obj->finish  if $spamassassin_obj;
 }