Mailing List Archive

Author: sidney
Date: Sun Dec 3 05:55:40 2023
New Revision: 1914293

URL: http://svn.apache.org/viewvc?rev=1914293&view=rev
Log:
bug 8201 Revert previous commit

Modified:
spamassassin/trunk/t/basic_meta2.t
spamassassin/trunk/t/dnsbl.t
spamassassin/trunk/t/hashbl.t
spamassassin/trunk/t/uribl.t

Modified: spamassassin/trunk/t/basic_meta2.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/basic_meta2.t?rev=1914293&r1=1914292&r2=1914293&view=diff
==============================================================================
--- spamassassin/trunk/t/basic_meta2.t (original)
+++ spamassassin/trunk/t/basic_meta2.t Sun Dec 3 05:55:40 2023
@@ -8,7 +8,7 @@ use Test::More;

# run many times to catch some random natured failures
my $iterations = 5;
-plan tests => $iterations + 1;
+plan tests => 24 * $iterations;

# ---------------------------------------------------------------------------

@@ -124,10 +124,8 @@ tstlocalrules (qq{
meta TEST_META_K __TEST_META_K
});

-my $iterations_passed = 0;
for (1 .. $iterations) {
- ok(sarun ("-L -t < data/nice/001 2>&1", \&patterns_run_cb));
- $iterations_passed++ if ok_all_patterns(1);
+ sarun ("-L -t < data/nice/001 2>&1", \&patterns_run_cb);
+ ok_all_patterns();
}

-ok($iterations_passed > 0, 'at least one test attempt passed');

Modified: spamassassin/trunk/t/dnsbl.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dnsbl.t?rev=1914293&r1=1914292&r2=1914293&view=diff
==============================================================================
--- spamassassin/trunk/t/dnsbl.t (original)
+++ spamassassin/trunk/t/dnsbl.t Sun Dec 3 05:55:40 2023
@@ -9,7 +9,7 @@ plan skip_all => "Can't use Net::DNS Saf

# run many times to catch some random natured failures
my $iterations = 5;
-plan tests => $iterations + 1;
+plan tests => 21 * $iterations;

# ---------------------------------------------------------------------------
# bind configuration currently used to support this test
@@ -151,11 +151,9 @@ priority DNSBL_TEST_RELAY 2000

");

-my $iterations_passed = 0;
for (1 .. $iterations) {
clear_localrules() if $_ == 3; # do some tests without any other rules to check meta bugs
- ok(sarun ("-t < data/spam/dnsbl.eml 2>&1", \&patterns_run_cb));
- $iterations_passed++ if ok_all_patterns(1);
+ sarun ("-t < data/spam/dnsbl.eml 2>&1", \&patterns_run_cb);
+ ok_all_patterns();
}

-ok($iterations_passed > 0, 'at least one test attempt passed');

Modified: spamassassin/trunk/t/hashbl.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/hashbl.t?rev=1914293&r1=1914292&r2=1914293&view=diff
==============================================================================
--- spamassassin/trunk/t/hashbl.t (original)
+++ spamassassin/trunk/t/hashbl.t Sun Dec 3 05:55:40 2023
@@ -9,7 +9,7 @@ plan skip_all => "Can't use Net::DNS Saf

# run many times to catch some random natured failures
my $iterations = 5;
-plan tests => 2 * $iterations + 1;
+plan tests => 13 * $iterations;

# ---------------------------------------------------------------------------

@@ -141,12 +141,10 @@ tstlocalrules(q{
priority X_HASHBL_URI 2000
});

-my $iterations_passed = 0;
for (1 .. $iterations) {
clear_localrules() if $_ == 3; # do some tests without any other rules to check meta bugs
ok sarun ("-t -D async,dns,HashBL < data/spam/hashbl 2>&1", \&patterns_run_cb);
ok(check_queries());
- $iterations_passed++ if ok_all_patterns(1);
+ ok_all_patterns();
}

-ok($iterations_passed > 0, 'at least one test attempt passed');

Modified: spamassassin/trunk/t/uribl.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/uribl.t?rev=1914293&r1=1914292&r2=1914293&view=diff
==============================================================================
--- spamassassin/trunk/t/uribl.t (original)
+++ spamassassin/trunk/t/uribl.t Sun Dec 3 05:55:40 2023
@@ -9,7 +9,7 @@ plan skip_all => "Can't use Net::DNS Saf

# run many times to catch some random natured failures
my $iterations = 5;
-plan tests => $iterations + 1;
+plan tests => 10 * $iterations;

# ---------------------------------------------------------------------------

@@ -71,11 +71,9 @@ tstlocalrules(q{

});

-my $iterations_passed = 0;
for (1 .. $iterations) {
clear_localrules() if $_ == 3; # do some tests without any other rules to check meta bugs
ok sarun ("-t < data/spam/dnsbl.eml", \&patterns_run_cb);
- $iterations_passed++ if ok_all_patterns(1);
+ ok_all_patterns();
}

-ok($iterations_passed > 0, 'at least one test attempt passed');