Mailing List Archive

Author: sidney
Date: Sat May 28 15:06:49 2022
New Revision: 1901358

URL: http://svn.apache.org/viewvc?rev=1901358&view=rev
Log:
bug 7997 move non-rule settings from 01_test_rules.cf to 01_test_rules.pre

Modified:
spamassassin/trunk/t/data/01_test_rules.cf
spamassassin/trunk/t/data/01_test_rules.pre

Modified: spamassassin/trunk/t/data/01_test_rules.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/01_test_rules.cf?rev=1901358&r1=1901357&r2=1901358&view=diff
==============================================================================
--- spamassassin/trunk/t/data/01_test_rules.cf (original)
+++ spamassassin/trunk/t/data/01_test_rules.cf Sat May 28 15:06:49 2022
@@ -18,29 +18,10 @@
# limitations under the License.
# </@LICENSE>

-# This file defines a subset of the default configuration and rules that tests can count on
+# This file defines a subset of the default rules that tests can count on
# If you need something else in a test, use tstpre, tstlocalrules, or tstprefs in the test
# instead of adding it here, so tests can be more self-contained and maintainable.

-clear_report_template
-report _SUMMARY_
-
-clear_headers
-
-add_header spam Flag _YESNOCAPS_
-add_header all Level _STARS(*)_
-add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_"
-
-ifplugin Mail::SpamAssassin::Plugin::DCC
-use_dcc 0
-endif
-ifplugin Mail::SpamAssassin::Plugin::Razor2
-use_razor2 0
-endif
-ifplugin Mail::SpamAssassin::Plugin::Pyzor
-use_pyzor 0
-endif
-
header TEST_NOREALNAME From =~ /^["\s]*\<?\S+\@\S+\>?\s*$/
describe TEST_NOREALNAME From: does not include a real name
score TEST_NOREALNAME 5

Modified: spamassassin/trunk/t/data/01_test_rules.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/01_test_rules.pre?rev=1901358&r1=1901357&r2=1901358&view=diff
==============================================================================
--- spamassassin/trunk/t/data/01_test_rules.pre (original)
+++ spamassassin/trunk/t/data/01_test_rules.pre Sat May 28 15:06:49 2022
@@ -18,3 +18,22 @@ loadplugin Mail::SpamAssassin::Plugin::F
loadplugin Mail::SpamAssassin::Plugin::Phishing
loadplugin Mail::SpamAssassin::Plugin::ExtractText

+clear_report_template
+report _SUMMARY_
+
+clear_headers
+
+add_header spam Flag _YESNOCAPS_
+add_header all Level _STARS(*)_
+add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_"
+
+ifplugin Mail::SpamAssassin::Plugin::DCC
+use_dcc 0
+endif
+ifplugin Mail::SpamAssassin::Plugin::Razor2
+use_razor2 0
+endif
+ifplugin Mail::SpamAssassin::Plugin::Pyzor
+use_pyzor 0
+endif
+