svn commit: r209520 - /spamassassin/trunk/t/spamd.t

[pa...@apache.org]

Author: parker
Date: Wed Jul  6 14:45:29 2005
New Revision: 209520

URL: http://svn.apache.org/viewcvs?rev=209520&view=rev
Log:
Fixes issue where second spamd instance was not getting killed

Modified:
    spamassassin/trunk/t/spamd.t

Modified: spamassassin/trunk/t/spamd.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/spamd.t?rev=209520&r1=209519&r2=209520&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd.t (original)
+++ spamassassin/trunk/t/spamd.t Wed Jul  6 14:45:29 2005
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 12) };
+use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 14) };
 
 exit if $SKIP_SPAMD_TESTS;
 
@@ -22,7 +22,9 @@
 
 );
 
-ok (sdrun ("-L", "< data/spam/001", \&patterns_run_cb));
+ok(start_spamd("-L"));
+
+ok(spamcrun("< data/spam/001", \&patterns_run_cb));
 ok_all_patterns();
 
 %patterns = (
@@ -31,5 +33,7 @@
              );
 
 
-ok (sdrun ("-L", "< data/spam/018", \&patterns_run_cb));
+ok (spamcrun("< data/spam/018", \&patterns_run_cb));
 ok_all_patterns();
+
+ok(stop_spamd());