diff options
| -rw-r--r-- | check/magma/magma_check.c | 4 | ||||
| -rw-r--r-- | check/magma/providers/provide_check.c | 11 | ||||
| -rw-r--r-- | check/magma/providers/provide_check.h | 2 | ||||
| -rw-r--r-- | check/magma/providers/virus_check.c | 14 | ||||
| -rw-r--r-- | check/magma/servers/smtp/smtp_check.c | 1 | ||||
| -rw-r--r-- | sandbox/spool/scan/.empty | 0 |
6 files changed, 17 insertions, 15 deletions
diff --git a/check/magma/magma_check.c b/check/magma/magma_check.c index 42208295..f740e74e 100644 --- a/check/magma/magma_check.c +++ b/check/magma/magma_check.c @@ -244,10 +244,10 @@ int main(int argc, char *argv[]) { exit(EXIT_FAILURE); } - // Run net_listen in the background. + // Run the network listener using a background thread. net_listen_thread = thread_alloc(net_listen, NULL); - // Only during development... + // During development, we flush the cache system before running the unit tests. cache_flush(); // Unit Test Config diff --git a/check/magma/providers/provide_check.c b/check/magma/providers/provide_check.c index f14cf7ee..1967fe3b 100644 --- a/check/magma/providers/provide_check.c +++ b/check/magma/providers/provide_check.c @@ -500,14 +500,15 @@ END_TEST START_TEST (check_virus_s) { log_disable(); - stringer_t *errmsg = NULL; + bool_t result = true; + stringer_t *errmsg = MANAGEDBUF(1024); - if (magma.iface.virus.available) { - errmsg = NULLER(check_virus_sthread()); + if (status() && magma.iface.virus.available) { + result = check_virus_sthread(errmsg); } - log_test("CHECKERS / VIRUS / SINGLE THREADED:", (status() || !magma.iface.virus.available) ? errmsg : NULLER("SKIPPED")); - ck_assert_msg(!magma.iface.virus.available, NULLER("The virus checker test failed.")); + log_test("CHECKERS / VIRUS / SINGLE THREADED:", (magma.iface.virus.available ? errmsg : NULLER("SKIPPED"))); + ck_assert_msg(result, st_char_get(errmsg)); } END_TEST diff --git a/check/magma/providers/provide_check.h b/check/magma/providers/provide_check.h index 4a8ca847..4ea391aa 100644 --- a/check/magma/providers/provide_check.h +++ b/check/magma/providers/provide_check.h @@ -52,7 +52,7 @@ bool_t check_dspam_mail_sthread(void); Suite * suite_check_provide(void); /// virus_check.c -chr_t * check_virus_sthread(void); +bool_t check_virus_sthread(stringer_t *errmsg); /// ecies_check.c void check_ecies_cleanup(EC_KEY *key, cryptex_t *ciphered, stringer_t *hex_pub, stringer_t *hex_priv, unsigned char *text, unsigned char *copy, unsigned char *original); diff --git a/check/magma/providers/virus_check.c b/check/magma/providers/virus_check.c index 8b9a1819..3235e071 100644 --- a/check/magma/providers/virus_check.c +++ b/check/magma/providers/virus_check.c @@ -7,7 +7,7 @@ #include "magma_check.h" -chr_t * check_virus_sthread(void) { + bool_t check_virus_sthread(stringer_t *errmsg) { stringer_t *data = NULL; uint32_t max = check_message_max(); @@ -16,17 +16,17 @@ chr_t * check_virus_sthread(void) { // Retrieve data for the current message. if (!(data = check_message_get(i))) { - log_info("Failed to get the message data. { message = %i }", i); - return "check_message_get() error"; + st_sprint(errmsg, "Failed to get the message data. { message = %i }", i); + return false; } - if (virus_check(data) == -1) { - log_info("There was a virus check error. { message = %i }", i); - return "virus check error"; + else if (virus_check(data) == -1) { + st_sprint(errmsg, "The virus checker returned an error. { message = %i }", i); + return false; } st_cleanup(data); } - return NULL; + return true; } diff --git a/check/magma/servers/smtp/smtp_check.c b/check/magma/servers/smtp/smtp_check.c index a4883575..b227bd2d 100644 --- a/check/magma/servers/smtp/smtp_check.c +++ b/check/magma/servers/smtp/smtp_check.c @@ -166,6 +166,7 @@ Suite * suite_check_smtp(void) { testcase(s, tc, "SMTP Rollout/S", check_smtp_accept_rollout_s); testcase(s, tc, "SMTP Signatres/S", check_smtp_accept_store_spamsig_s); testcase(s, tc, "SMTP Greylist/S", check_smtp_checkers_greylist_s); + return s; } diff --git a/sandbox/spool/scan/.empty b/sandbox/spool/scan/.empty new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/sandbox/spool/scan/.empty |