From ca9be55a98c094e8026a4003a099573dd4137050 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 2 Sep 2025 16:13:22 +0100 Subject: Store utsname details in the host's detail field --- test/perf-ingest.cpp | 3 ++- test/test-ingest.cpp | 2 +- test/test-util.cpp | 8 ++++++++ test/test-util.hpp | 3 +++ 4 files changed, 14 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/perf-ingest.cpp b/test/perf-ingest.cpp index 36a3b49..ed87192 100644 --- a/test/perf-ingest.cpp +++ b/test/perf-ingest.cpp @@ -102,7 +102,8 @@ namespace { void doIngestFile(benchmark::State & state) { - WebStat::Ingestor ingestor {"perf-hostname", std::make_shared("webstat")}; + WebStat::Ingestor ingestor { + WebStat::getTestUtsName("perf-hostname"), std::make_shared("webstat")}; for (auto loop : state) { WebStat::FilePtr logFile {fopen(TMP_LOG.c_str(), "r")}; ingestor.ingestLog(logFile.get()); diff --git a/test/test-ingest.cpp b/test/test-ingest.cpp index fb35915..5f29806 100644 --- a/test/test-ingest.cpp +++ b/test/test-ingest.cpp @@ -178,6 +178,6 @@ BOOST_DATA_TEST_CASE(StoreLogLine, }), line) { - WebStat::Ingestor {"test-hostname", std::make_shared("webstat")}.ingestLogLine( + WebStat::Ingestor {WebStat::getTestUtsName("test-hostname"), std::make_shared("webstat")}.ingestLogLine( DB::MockDatabase::openConnectionTo("webstat").get(), line); } diff --git a/test/test-util.cpp b/test/test-util.cpp index 4648498..b9011a4 100644 --- a/test/test-util.cpp +++ b/test/test-util.cpp @@ -11,4 +11,12 @@ namespace WebStat { { return DB::MockDatabase::openConnectionTo(name); } + + utsname + getTestUtsName(const std::string_view nodename) + { + utsname uts {}; + nodename.copy(uts.nodename, sizeof(uts.nodename)); + return uts; + } } diff --git a/test/test-util.hpp b/test/test-util.hpp index 5b2a968..3338c5e 100644 --- a/test/test-util.hpp +++ b/test/test-util.hpp @@ -3,6 +3,7 @@ #include #include #include +#include namespace WebStat { #define XSTR(s) STR(s) @@ -33,4 +34,6 @@ namespace WebStat { }; template using ParseData = std::tuple; + + utsname getTestUtsName(std::string_view); } -- cgit v1.2.3