snmp: update additional dependencies and improve SNMP record validation in tests

Signed-off-by: k402xxxcenxxx <[email protected]>

Author: k402xxxcenxxx

run_code_analysis.sh

@@ -11,7 +11,7 @@ CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-docker}
 
 # From the Dockerfile
 FLB_CMAKE_OPTIONS=${FLB_CMAKE_OPTIONS:--DFLB_BACKTRACE=Off -DFLB_SHARED_LIB=Off -DFLB_DEBUG=On -DFLB_ALL=On -DFLB_EXAMPLES=Off -DFLB_TESTS_INTERNAL=On -DFLB_TESTS_RUNTIME=On}
-ADDITIONAL_DEPS=${ADDITIONAL_DEPS:-libssl-dev libsasl2-dev pkg-config libsystemd-dev zlib1g-dev libpq-dev postgresql-server-dev-all flex bison libyaml-dev netcat}
+ADDITIONAL_DEPS=${ADDITIONAL_DEPS:-libssl-dev libsasl2-dev pkg-config libsystemd-dev zlib1g-dev libpq-dev postgresql-server-dev-all flex bison libsnmp-dev libyaml-dev netcat}
 
 # From the Unit Tests script
 SKIP_TESTS=${SKIP_TESTS:-flb-rt-out_elasticsearch flb-it-network flb-it-fstore flb-rt-out_elasticsearch flb-rt-out_td flb-rt-out_forward flb-rt-in_disk flb-rt-in_proc}

tests/runtime/in_snmp.c

@@ -48,6 +48,7 @@ void flb_test_snmp_records_message_get(struct callback_records *records)
 
     TEST_CHECK(records->num_records > 0);
     for (i = 0; i < records->num_records; i++) {
+        off = 0;
         msgpack_unpacked_init(&result);
 
         while (msgpack_unpack_next(&result, records->records[i].data,
@@ -87,21 +88,28 @@ void flb_test_snmp_records_message_walk(struct callback_records *records)
 
     TEST_CHECK(records->num_records > 0);
     for (i = 0; i < records->num_records; i++) {
+        off = 0;
+
         msgpack_unpacked_init(&result);
         while (msgpack_unpack_next(&result, records->records[i].data,
                                    records->records[i].size, &off) == MSGPACK_UNPACK_SUCCESS) {
             flb_time_pop_from_msgpack(&ftm, &result, &obj);
             TEST_CHECK(obj->type == MSGPACK_OBJECT_MAP);
-            for (j = 0; j < obj->via.map.size; j++) {
-                key = obj->via.map.ptr[j].key;
-                val = obj->via.map.ptr[j].val;
-
-                TEST_CHECK(strncmp(expected_keys[j],
-                               key.via.str.ptr,
-                               26) == 0);
-                TEST_CHECK(strncmp(expected_vals[j],
-                               val.via.str.ptr,
+            {
+                size_t count = obj->via.map.size;
+                TEST_CHECK(count >= 2);
+                size_t limit = count < 2 ? count : 2;
+                for (j = 0; j < limit; j++) {
+                    key = obj->via.map.ptr[j].key;
+                    val = obj->via.map.ptr[j].val;
+
+                    TEST_CHECK(strncmp(expected_keys[j],
+                                key.via.str.ptr,
+                                26) == 0);
+                    TEST_CHECK(strncmp(expected_vals[j],
+                                val.via.str.ptr,
                                7) == 0);
+                }
             }
         }
         msgpack_unpacked_destroy(&result);
@@ -153,7 +161,7 @@ void do_test_records(char *response, void (*records_cb)(struct callback_records
     /* Start test */
     TEST_CHECK(flb_start(ctx) == 0);
 
-    /* 4 sec passed. It must have flushed */
+    /* 5 sec passed. It must have flushed */
     sleep(5);
 
     records_cb(records);