From a828ecdeb784c968517e6cb6adb650fdbe2e5124 Mon Sep 17 00:00:00 2001 From: Andrea Terzolo Date: Fri, 9 Aug 2024 14:12:06 +0200 Subject: [PATCH] cleanup(tests): move some scap file tests under the right directory Signed-off-by: Andrea Terzolo --- userspace/libsinsp/test/CMakeLists.txt | 3 - .../libsinsp/test/helpers/scap_file_helpers.h | 1 + .../libsinsp/test/libsinsp_test_var.h.in | 2 + .../cycledumper/cycledumper.cpp} | 62 ++++++++----------- 4 files changed, 29 insertions(+), 39 deletions(-) rename userspace/libsinsp/test/{savefile.ut.cpp => scap_files/cycledumper/cycledumper.cpp} (73%) diff --git a/userspace/libsinsp/test/CMakeLists.txt b/userspace/libsinsp/test/CMakeLists.txt index 4694ff857b..980938dcbd 100644 --- a/userspace/libsinsp/test/CMakeLists.txt +++ b/userspace/libsinsp/test/CMakeLists.txt @@ -39,8 +39,6 @@ configure_file ( file(GLOB_RECURSE TEST_PLUGINS ${CMAKE_CURRENT_SOURCE_DIR}/plugins/*.cpp) -add_definitions(-DRESOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}/resources") - if(NOT WIN32) file(GLOB_RECURSE SINSP_PARSERS_SUITE ${CMAKE_CURRENT_SOURCE_DIR}/parsers/*.cpp) @@ -119,7 +117,6 @@ set(LIBSINSP_UNIT_TESTS_SOURCES state.ut.cpp dns_manager.ut.cpp eventformatter.ut.cpp - savefile.ut.cpp sinsp_metrics.ut.cpp thread_table.ut.cpp ifinfo.ut.cpp diff --git a/userspace/libsinsp/test/helpers/scap_file_helpers.h b/userspace/libsinsp/test/helpers/scap_file_helpers.h index ac7d223451..2618bc1dd5 100644 --- a/userspace/libsinsp/test/helpers/scap_file_helpers.h +++ b/userspace/libsinsp/test/helpers/scap_file_helpers.h @@ -20,6 +20,7 @@ limitations under the License. #include #include +#include namespace scap_file_test_helpers { diff --git a/userspace/libsinsp/test/libsinsp_test_var.h.in b/userspace/libsinsp/test/libsinsp_test_var.h.in index 0ff9e2317e..6ecf966d0c 100644 --- a/userspace/libsinsp/test/libsinsp_test_var.h.in +++ b/userspace/libsinsp/test/libsinsp_test_var.h.in @@ -2,3 +2,5 @@ // Absolute path to the scap files dir #define LIBSINSP_TEST_SCAP_FILES_DIR "${CMAKE_BINARY_DIR}/scap_files/" + +#define LIBSINSP_TMP_TEST_SCAP_FILES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/resources/" diff --git a/userspace/libsinsp/test/savefile.ut.cpp b/userspace/libsinsp/test/scap_files/cycledumper/cycledumper.cpp similarity index 73% rename from userspace/libsinsp/test/savefile.ut.cpp rename to userspace/libsinsp/test/scap_files/cycledumper/cycledumper.cpp index c2d6c52c2d..d677d74f46 100644 --- a/userspace/libsinsp/test/savefile.ut.cpp +++ b/userspace/libsinsp/test/scap_files/cycledumper/cycledumper.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 /* -Copyright (C) 2023 The Falco Authors. +Copyright (C) 2024 The Falco Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,22 +18,22 @@ limitations under the License. #include #include - +#include #include using namespace std; #ifdef __x86_64__ -TEST(savefile, proclist) +TEST(scap_file, filter) { - sinsp inspector; - inspector.open_savefile(RESOURCE_DIR "/sample.scap"); + { + // Check the dimension of the table before the filtering + sinsp inspector; + inspector.open_savefile(LIBSINSP_TMP_TEST_SCAP_FILES_DIR "/sample.scap"); - ASSERT_EQ(inspector.m_thread_manager->get_thread_count(), 94); -} + ASSERT_EQ(inspector.m_thread_manager->get_thread_count(), 94); + } -TEST(savefile, filter) -{ char filtered_scap[] = "filtered.XXXXXX.scap"; int filtered_fd = mkstemps(filtered_scap, strlen(".scap")); @@ -43,10 +43,9 @@ TEST(savefile, filter) { sinsp inspector; inspector.set_filter("proc.name=ifplugd"); - inspector.open_savefile(RESOURCE_DIR "/sample.scap"); + inspector.open_savefile(LIBSINSP_TMP_TEST_SCAP_FILES_DIR "/sample.scap"); - auto dumper = std::make_unique(&inspector, filtered_scap, - 0, 0, 0, 0, true); + auto dumper = std::make_unique(&inspector, filtered_scap, 0, 0, 0, 0, true); int32_t res; sinsp_evt* evt; @@ -58,8 +57,7 @@ TEST(savefile, filter) { dumper->dump(evt); } - } - while(res != SCAP_EOF); + } while(res != SCAP_EOF); dumper->close(); inspector.close(); @@ -78,17 +76,11 @@ TEST(savefile, filter) int n_opens = 0; int n_closes = 0; -void open_cb() -{ - n_opens +=1; -} +void open_cb() { n_opens += 1; } -void close_cb() -{ - n_closes += 1; -} +void close_cb() { n_closes += 1; } -TEST(savefile, cycledumper_num_events) +TEST(scap_file, cycledumper_num_events) { char capture_scap[] = "capture.XXXXXX.scap"; int events_per_capture = 100; @@ -102,12 +94,12 @@ TEST(savefile, cycledumper_num_events) { sinsp inspector; - inspector.open_savefile(RESOURCE_DIR "/sample.scap"); + inspector.open_savefile(LIBSINSP_TMP_TEST_SCAP_FILES_DIR "/sample.scap"); - auto dumper = std::make_unique(&inspector, capture_scap, - 0, 0, 0, events_per_capture, true); + auto dumper = std::make_unique(&inspector, capture_scap, 0, 0, 0, events_per_capture, + true); - std::vector> open_cbs = {std::bind(&open_cb)}; + std::vector> open_cbs = {std::bind(&open_cb)}; std::vector> close_cbs = {std::bind(&close_cb)}; dumper->set_callbacks(open_cbs, close_cbs); @@ -122,8 +114,7 @@ TEST(savefile, cycledumper_num_events) { dumper->dump(evt); } - } - while(res != SCAP_EOF); + } while(res != SCAP_EOF); dumper->close(); inspector.close(); @@ -135,7 +126,7 @@ TEST(savefile, cycledumper_num_events) unlink(capture_scap); } -TEST(savefile, cycledumper_seconds) +TEST(scap_file, cycledumper_seconds) { char capture_scap[] = "capture.XXXXXX.scap"; int seconds_per_capture = 1; @@ -149,12 +140,12 @@ TEST(savefile, cycledumper_seconds) { sinsp inspector; - inspector.open_savefile(RESOURCE_DIR "/sample.scap"); + inspector.open_savefile(LIBSINSP_TMP_TEST_SCAP_FILES_DIR "/sample.scap"); - auto dumper = std::make_unique(&inspector, capture_scap, - 0, seconds_per_capture, 0, 0, true); + auto dumper = std::make_unique(&inspector, capture_scap, 0, seconds_per_capture, 0, + 0, true); - std::vector> open_cbs = {std::bind(&open_cb)}; + std::vector> open_cbs = {std::bind(&open_cb)}; std::vector> close_cbs = {std::bind(&close_cb)}; dumper->set_callbacks(open_cbs, close_cbs); @@ -169,8 +160,7 @@ TEST(savefile, cycledumper_seconds) { dumper->dump(evt); } - } - while(res != SCAP_EOF); + } while(res != SCAP_EOF); dumper->close(); inspector.close();