X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Ftst-filters.c;h=4dcbaa8d7d6edd1037e75d18f16e318160668626;hb=5f78206a0829d7778a1810feecfe13917d1e6d1f;hp=0c08f6964037e456ccf1cfe958687936864b5ec7;hpb=b5c79dd713c2e444df9ba50b48718330ad936eb7;p=apps%2Fpfixtools.git

diff --git a/postlicyd/tst-filters.c b/postlicyd/tst-filters.c
index 0c08f69..4dcbaa8 100644
--- a/postlicyd/tst-filters.c
+++ b/postlicyd/tst-filters.c
@@ -62,6 +62,8 @@ static char *read_query(const char *basepath, const char *filename,
         if (end != NULL) {
             *end = buff + (map.end - map.map);
             **end = '\0';
+        } else {
+          buff[map.end - map.map] = '\0';
         }
         file_map_close(&map);
     }
@@ -144,7 +146,6 @@ static bool run_greylisttest(const config_t *config, const char *basepath)
 //    filter_t *greylist2;
 
 #define QUERY(Q)                                                               \
-    printf("Reading greylist_" STR(Q) "\n");                                   \
     if (read_query(basepath, "greylist_" STR(Q), buff_##Q, NULL, &Q) == NULL) {    \
         return false;                                                          \
     }
@@ -167,13 +168,17 @@ static bool run_greylisttest(const config_t *config, const char *basepath)
 
     /* Test greylist */
     TEST("greylisted", filter_test(greylist1, &q1, HTK_GREYLIST));
-    TEST("greylisted", filter_test(greylist1, &q1, HTK_GREYLIST));
+    TEST("too_fast", filter_test(greylist1, &q1, HTK_GREYLIST));
+    sleep(5);
+    TEST("too_slow", filter_test(greylist1, &q1, HTK_GREYLIST));
     sleep(2);
     TEST("whitelisted", filter_test(greylist1, &q1, HTK_WHITELIST));
     TEST("other_greylisted", filter_test(greylist1, &q2, HTK_GREYLIST));
     TEST("auto_whitelisted", filter_test(greylist1, &q1, HTK_WHITELIST));
     TEST("other_auto_whitelisted", filter_test(greylist1, &q2, HTK_WHITELIST));
     TEST("greylisted", filter_test(greylist1, &q3, HTK_GREYLIST));
+    sleep(10);
+    TEST("cleanup", filter_test(greylist1, &q1, HTK_GREYLIST));
 
     return ok;
 }
@@ -197,8 +202,8 @@ int main(int argc, char *argv[])
 #define RM(File)                                                               \
       snprintf(path, FILENAME_MAX, "%s/%s", basepath, File);                   \
       unlink(path);
-      RM("test1_greylist.db");
-      RM("test1_whitelist.db");
+//      RM("test1_greylist.db");
+//      RM("test1_whitelist.db");
       RM("test2_greylist.db");
       RM("test2_whitelist.db");
 #undef RM