tests: move apps/metrics_tester to tests/unit

so that we can reuse metrics_tester for unit test -- we will add tests exercising the query parameters supported by the exporter httpd server, like `__name__` and `__aggregate__`. Signed-off-by: Kefu Chai <[email protected]>
scylladb · May 12, 2024 · 00a448e · 00a448e
1 parent 04edaae
commit 00a448e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 29 deletions.
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -51,7 +51,6 @@ endmacro ()
 add_subdirectory (httpd)
 add_subdirectory (io_tester)
 add_subdirectory (rpc_tester)
-add_subdirectory(metrics_tester)
 add_subdirectory (iotune)
 add_subdirectory (memcached)
 add_subdirectory (seawreck)
diff --git a/apps/metrics_tester/CMakeLists.txt b/apps/metrics_tester/CMakeLists.txt
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -757,3 +757,10 @@ add_test (
 set_tests_properties (Seastar.unit.json2code
   PROPERTIES
     TIMEOUT ${Seastar_TEST_TIMEOUT})
+
+add_executable (metrics_tester
+  metrics_tester.cc)
+target_link_libraries (metrics_tester
+  PRIVATE
+    seastar_private
+    yaml-cpp::yaml-cpp)
diff --git a/apps/metrics_tester/conf-example.yaml → tests/unit/conf-example.yaml b/apps/metrics_tester/conf-example.yaml → tests/unit/conf-example.yaml
diff --git a/apps/metrics_tester/metrics_tester.cc → tests/unit/metrics_tester.cc b/apps/metrics_tester/metrics_tester.cc → tests/unit/metrics_tester.cc
@@ -26,7 +26,7 @@
 #include <seastar/core/relabel_config.hh>
 #include <seastar/core/internal/estimated_histogram.hh>
 #include <seastar/util/defer.hh>
-#include "../lib/stop_signal.hh"
+#include "../../apps/lib/stop_signal.hh"
 #include <map>
 #include <vector>
 #include <yaml-cpp/yaml.h>

diff --git a/apps/metrics_tester/test_metrics.py → tests/unit/test_metrics.py b/apps/metrics_tester/test_metrics.py → tests/unit/test_metrics.py