fixing unit test

build.py

@@ -365,10 +365,13 @@ def run_c_test(source):
     batch = "-batch"
     if os.getenv("NO_BATCH") != None: batch = ""
     if os.path.exists(bin_path):
-        result = os.system("gdb " + batch + " -return-child-result \
+        gdb = "gdb " + batch + " -return-child-result \
                 --eval-command=run --eval-command=where \
-                --eval-command='info locals' --args " + "./" + bin_path)
+                --eval-command='info locals' --args "
+        if os.getenv("NO_GDB") != None: gdb = ""
+        result = os.system(gdb + "./" + bin_path)
         if result != 0:
+            print("failed running " + source)
             exit(result)
     else:
         print("warning: no binary test {}".format(bin_path))
@@ -379,8 +382,8 @@ def c_test():
     for library_source in plugins.libraries_sources:
         run_c_test(plugins.test_of[library_source])
     tests = sources + map(
-                        lambda x: plugins.test_of[library_source],
-                        plugins.libraries_sources)
+            lambda x: plugins.test_of[library_source],
+            plugins.libraries_sources)
     run("gcov", ["src/" + x + ".c" for x in tests] ,"-o", ".")
     if binary_exists("lcov"):
         run("lcov", "--no-external", "--rc", "lcov_branch_coverage=1", "-c", "-d", ".", "-o", "./src/coverage.info")

src/plugins/output/kafka.c

@@ -36,6 +36,7 @@ static void logger (const rd_kafka_t *rk, int level,
 int output_setup(kafka_t* k, config* fk_conf)
 {
     trace_debug("kafka output_setup: entry");
+    if(fk_conf == NULL) return 1;
     char* brokers = NULL;
     char* zookeepers = NULL;
     char* topic = "logs";

src/plugins/output/kafka_test.c

@@ -4,9 +4,8 @@
 #include "kafka_client_test.c"
 #include "config.h"
 #include "kafka.c"
-int setup_kafka(kafka_t* k)
+int setup_kafka(kafka_t* k, config* fk_conf)
 {
-    config* fk_conf = NULL;
     return output_setup(k, fk_conf);
 }
 int send_kafka(kafka_t* k, char* buf, size_t len)
@@ -33,34 +32,34 @@ static char* test_setup_kafka()
     k.rk = &rk;
     fuse_get_context()->private_data = (void*) &private_data;
     test_with()->rd_kafka_conf_set_returns = RD_KAFKA_CONF_OK;
-    mu_assert("setup_kafka failed", setup_kafka(&k) == 0);
+    mu_assert("setup_kafka failed", setup_kafka(&k, &private_data) == 0);
     private_data.topic_n = 1;
     private_data.topic = brokers;
     private_data.zookeepers = brokers;
     private_data.zookeepers_n = 1;
     k.conf = NULL;
-    mu_assert("setup_kafka with zookeepers should succeed", setup_kafka(&k) == 0);
+    mu_assert("setup_kafka with zookeepers should succeed", setup_kafka(&k, &private_data) == 0);
     private_data.zookeepers_n = 0;
     test_with()->rd_kafka_conf_set_returns = 0;
-    mu_assert("setup_kafka succeeded", setup_kafka(&k) == 1);
+    mu_assert("setup_kafka succeeded", setup_kafka(&k, &private_data) == 1);
     test_with()->rd_kafka_conf_set_returns = RD_KAFKA_CONF_OK;
     test_with()->rd_kafka_new_returns_NULL = 1;
     private_data.zookeepers = NULL;
     mu_assert("setup_kafka with kafka "
-            "new returning NULL succeeded", setup_kafka(&k) == 1);
+            "new returning NULL succeeded", setup_kafka(&k, &private_data) == 1);
     private_data.zookeepers = brokers;
     test_with()->rd_kafka_new_returns_NULL = 0;
     test_with()->rd_kafka_brokers_add_returns = 0;
     mu_assert("setup_kafka with kafka rokers add failing",
-            setup_kafka(&k) == 1);
+            setup_kafka(&k, &private_data) == 1);
     test_with()->rd_kafka_brokers_add_returns = 1;
     test_with()->rd_kafka_topic_new_returns_NULL = 1;
     mu_assert("setup_kafka with kafka topic new failing",
-            setup_kafka(&k) == 1);
+            setup_kafka(&k, &private_data) == 1);
     test_with()->rd_kafka_topic_new_returns_NULL = 0;
     test_with()->rd_kafka_conf_set_fails_for = "batch.num.messages";
     mu_assert("setup_kafka should fail here",
-            setup_kafka(&k) == 1);
+            setup_kafka(&k, &private_data) == 1);
     test_with()->rd_kafka_conf_set_fails_for = NULL;
     /* TODO move to a specific unit test
     mu_assert("kafka_init failed", kafka_init(NULL));