Merge branch 'master' into testing

build/Makefile.am

@@ -19,6 +19,7 @@ build_info.h:
 include ../unix/Makefile.inc
 include ../src/Makefile.inc
 include ../tests/Makefile.inc
+include ../tools/metering/Makefile.inc
 
 # build tests for the default make targets only when enabled
 if AUTOBUILD_TESTS

src/ds/str-test.cpp

@@ -168,6 +168,8 @@ TEST_CASE("dsStr", TAGS) {
 
   SECTION("BOOST_STRONG_TYPEDEF(std::string, Id) id is serialized as string") { CHECK(ds::str(Id{"hi"}) == "hi"); }
 
+  SECTION("std::filesystem::path is serialized as string") { CHECK(ds::str(std::filesystem::path{"/hi"}) == "/hi"); }
+
   SECTION("intToString") {
     CHECK(ds::intToString(10) == "10");
     CHECK(ds::intToString(10, 10) == "10");

src/ds/str.h

@@ -21,9 +21,10 @@
 #include <gsl.h>
 
 #include <array>
-#include <memory>
 #include <boost/system/error_code.hpp>
 #include <chrono>
+#include <filesystem>
+#include <memory>
 #include <optional>
 #include <sstream>
 #include <variant>
@@ -200,6 +201,11 @@ struct Str<T, typename std::enable_if_t<std::is_convertible_v<T, std::string>>>
   static inline void f(std::ostream& ostream, const T& x) { ostream << static_cast<std::string>(x); }
 };
 
+template <>
+struct Str<std::filesystem::path> {
+  static void f(std::ostream& ostream, const std::filesystem::path& path) { ostream << path.string(); }
+};
+
 } // namespace detail
 
 template <typename Arg, typename... Args>

src/metering/archives-sanity-mock.h

@@ -28,6 +28,7 @@ class ArchivesSanityMock final : public trompeloeil::mock_interface<ArchivesSani
   IMPLEMENT_CONST_MOCK0(migrateFilenames);
   IMPLEMENT_CONST_MOCK1(withoutUpdates);
   IMPLEMENT_CONST_MOCK0(removeDeadArchives);
+  IMPLEMENT_CONST_MOCK0(restoreBackups);
 };
 
 } // namespace dss::metering

src/metering/archives-sanity-test.cpp

@@ -139,5 +139,25 @@ SCENARIO("archivesSanity", TAGS) {
       }
     }
   }
+  SECTION("restoreBackups") {
+    THEN("restoring a backup") {
+      REQUIRE_CALL(archivesStorage, searchRrdFiles())
+          .RETURN(std::vector{
+              std::filesystem::path{"/foo/3504175fe000000000016be7.rrd"s},
+              std::filesystem::path{"/foo/3504175fe000000000016be7-backup.rrd"s},
+              std::filesystem::path{"/foo/3504175fe000000000016be9-backup.rrd"s},
+          });
+
+      REQUIRE_CALL(system, rename("/foo/3504175fe000000000016be9-backup.rrd"s, "/foo/3504175fe000000000016be9.rrd"s));
+      CHECK(archivesSanity->restoreBackups() == true);
+    }
+    THEN("no change") {
+      REQUIRE_CALL(archivesStorage, searchRrdFiles())
+          .RETURN(std::vector{
+              std::filesystem::path{"/foo/3504175fe000000000016be7.rrd"s},
+          });
+      CHECK(archivesSanity->restoreBackups() == false);
+    }
+  }
 }
 } // namespace