From ea3745fd82f10afd5b0a3789713539a23d4d5110 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sat, 24 Aug 2024 22:53:49 +0200
Subject: [PATCH] test: move compat images, clean up and extend compat tests

---
 src/reader/internal/metadata_v2.cpp       |   2 +-
 test/{ => compat}/compat-v0.2.0.dwarfs    | Bin
 test/{ => compat}/compat-v0.2.3.dwarfs    | Bin
 test/{ => compat}/compat-v0.3.0.dwarfs    | Bin
 test/{ => compat}/compat-v0.4.0.dwarfs    | Bin
 test/{ => compat}/compat-v0.4.1.dwarfs    | Bin
 test/compat/compat-v0.5.6.dwarfs          | Bin 0 -> 3843 bytes
 test/compat/compat-v0.6.2.dwarfs          | Bin 0 -> 3913 bytes
 test/compat/compat-v0.7.5.dwarfs          | Bin 0 -> 3944 bytes
 test/compat/compat-v0.8.0.dwarfs          | Bin 0 -> 4317 bytes
 test/compat/compat-v0.9.10.dwarfs         | Bin 0 -> 4467 bytes
 test/{ => compat}/setuidgid-v0.4.1.dwarfs | Bin
 test/{ => compat}/setuidgid-v0.5.6.dwarfs | Bin
 test/compat_test.cpp                      |  71 +++++++++++++++++-----
 14 files changed, 58 insertions(+), 15 deletions(-)
 rename test/{ => compat}/compat-v0.2.0.dwarfs (100%)
 rename test/{ => compat}/compat-v0.2.3.dwarfs (100%)
 rename test/{ => compat}/compat-v0.3.0.dwarfs (100%)
 rename test/{ => compat}/compat-v0.4.0.dwarfs (100%)
 rename test/{ => compat}/compat-v0.4.1.dwarfs (100%)
 create mode 100644 test/compat/compat-v0.5.6.dwarfs
 create mode 100644 test/compat/compat-v0.6.2.dwarfs
 create mode 100644 test/compat/compat-v0.7.5.dwarfs
 create mode 100644 test/compat/compat-v0.8.0.dwarfs
 create mode 100644 test/compat/compat-v0.9.10.dwarfs
 rename test/{ => compat}/setuidgid-v0.4.1.dwarfs (100%)
 rename test/{ => compat}/setuidgid-v0.5.6.dwarfs (100%)

diff --git a/src/reader/internal/metadata_v2.cpp b/src/reader/internal/metadata_v2.cpp
index ecffab154..468a6b36d 100644
--- a/src/reader/internal/metadata_v2.cpp
+++ b/src/reader/internal/metadata_v2.cpp
@@ -1147,7 +1147,7 @@ template <typename LoggerPolicy>
 nlohmann::json
 metadata_<LoggerPolicy>::info_as_json(fsinfo_options const& opts,
                                       filesystem_info const* fsinfo) const {
-  auto info = nlohmann::json::object();
+  nlohmann::json info;
   vfs_stat stbuf;
   statvfs(&stbuf);
 
diff --git a/test/compat-v0.2.0.dwarfs b/test/compat/compat-v0.2.0.dwarfs
similarity index 100%
rename from test/compat-v0.2.0.dwarfs
rename to test/compat/compat-v0.2.0.dwarfs
diff --git a/test/compat-v0.2.3.dwarfs b/test/compat/compat-v0.2.3.dwarfs
similarity index 100%
rename from test/compat-v0.2.3.dwarfs
rename to test/compat/compat-v0.2.3.dwarfs
diff --git a/test/compat-v0.3.0.dwarfs b/test/compat/compat-v0.3.0.dwarfs
similarity index 100%
rename from test/compat-v0.3.0.dwarfs
rename to test/compat/compat-v0.3.0.dwarfs
diff --git a/test/compat-v0.4.0.dwarfs b/test/compat/compat-v0.4.0.dwarfs
similarity index 100%
rename from test/compat-v0.4.0.dwarfs
rename to test/compat/compat-v0.4.0.dwarfs
diff --git a/test/compat-v0.4.1.dwarfs b/test/compat/compat-v0.4.1.dwarfs
similarity index 100%
rename from test/compat-v0.4.1.dwarfs
rename to test/compat/compat-v0.4.1.dwarfs
diff --git a/test/compat/compat-v0.5.6.dwarfs b/test/compat/compat-v0.5.6.dwarfs
new file mode 100644
index 0000000000000000000000000000000000000000..874f26efff964f0639345c0ae0658844f95ec894
GIT binary patch
literal 3843
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
D!3fyA

literal 0
HcmV?d00001

diff --git a/test/compat/compat-v0.6.2.dwarfs b/test/compat/compat-v0.6.2.dwarfs
new file mode 100644
index 0000000000000000000000000000000000000000..5d582b1c21e6e9c5912f3752858a4d1a2a7db643
GIT binary patch
literal 3913
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
RkIR+<cFse8D`e+<^gnz)`RxDz

literal 0
HcmV?d00001

diff --git a/test/compat/compat-v0.7.5.dwarfs b/test/compat/compat-v0.7.5.dwarfs
new file mode 100644
index 0000000000000000000000000000000000000000..ff48ee12534966b1f8371431cf9608aae368f672
GIT binary patch
literal 3944
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
W?0lU)Na1PPlgEBxrsuNXT=YL00{vwG

literal 0
HcmV?d00001

diff --git a/test/compat/compat-v0.8.0.dwarfs b/test/compat/compat-v0.8.0.dwarfs
new file mode 100644
index 0000000000000000000000000000000000000000..e5ff0574f3c5e88cccbd811428d3f630b730ee5d
GIT binary patch
literal 4317
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
W=yE&QW_v^3MD{JAL<##YME?Up*=2bE

literal 0
HcmV?d00001

diff --git a/test/compat/compat-v0.9.10.dwarfs b/test/compat/compat-v0.9.10.dwarfs
new file mode 100644
index 0000000000000000000000000000000000000000..0e76a213ee4eb5ad7110902fd39607e2910865cb
GIT binary patch
literal 4467
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
Z&Qfroy0)DCmZFyF>{mdZ8SJ+V{SQ+Pn2P`a

literal 0
HcmV?d00001

diff --git a/test/setuidgid-v0.4.1.dwarfs b/test/compat/setuidgid-v0.4.1.dwarfs
similarity index 100%
rename from test/setuidgid-v0.4.1.dwarfs
rename to test/compat/setuidgid-v0.4.1.dwarfs
diff --git a/test/setuidgid-v0.5.6.dwarfs b/test/compat/setuidgid-v0.5.6.dwarfs
similarity index 100%
rename from test/setuidgid-v0.5.6.dwarfs
rename to test/compat/setuidgid-v0.5.6.dwarfs
diff --git a/test/compat_test.cpp b/test/compat_test.cpp
index daa759f40..fa345f66c 100644
--- a/test/compat_test.cpp
+++ b/test/compat_test.cpp
@@ -61,10 +61,38 @@
 using namespace dwarfs;
 namespace fs = std::filesystem;
 
+/*------------------------------------------------------------------------------
+
+Command line options used to create the 0.4.1 and later images:
+
+$ mkdwarfs -i @compat -o compat-vx.y.z.dwarfs --with-devices --with-specials \
+           -S10 -l0 -W5 --order=similarity
+
+------------------------------------------------------------------------------*/
+
 namespace {
 
 auto test_dir = fs::path(TEST_DATA_DIR).make_preferred();
 
+template <class F>
+void walk_json(nlohmann::json& j, F f) {
+  for (auto& [k, v] : j.items()) {
+    f(v);
+
+    if (v.is_structured()) {
+      walk_json(v, f);
+    }
+  }
+}
+
+void remove_inode_numbers(nlohmann::json& j) {
+  walk_json(j, [](nlohmann::json& j) {
+    if (j.contains("inode")) {
+      j.erase("inode");
+    }
+  });
+}
+
 char const* reference_v0_2 = R"(
 {
   "root": {
@@ -414,7 +442,7 @@ char const* reference_v0_2 = R"(
 }
 )";
 
-char const* reference = R"(
+char const* reference_v0_4 = R"(
 {
   "root": {
     "inode": 0,
@@ -789,6 +817,7 @@ char const* reference = R"(
 
 std::vector<std::string> versions{
     "0.2.0", "0.2.3", "0.3.0", "0.4.0", "0.4.1",
+    "0.5.6", "0.6.2", "0.7.5", "0.8.0", "0.9.10",
 };
 
 std::string format_sh = R"(#!/bin/bash
@@ -839,16 +868,22 @@ void walk_tree(reader::filesystem_v2 const& fs, T& cb,
 }
 
 void check_compat(logger& lgr, reader::filesystem_v2 const& fs,
-                  std::string const& version) {
+                  std::string const& version, bool enable_nlink) {
   bool has_devices = not(version == "0.2.0" or version == "0.2.3");
   bool has_ac_time = version == "0.2.0" or version == "0.2.3";
+  bool nlink_affects_blocks =
+      not(version.starts_with("0.2.") or version.starts_with("0.3.") or
+          version.starts_with("0.4."));
+
+  auto const expected_blocks =
+      nlink_affects_blocks and enable_nlink ? 2747 : 10614;
 
   vfs_stat vfsbuf;
   fs.statvfs(&vfsbuf);
 
   EXPECT_EQ(1, vfsbuf.bsize);
   EXPECT_EQ(1, vfsbuf.frsize);
-  EXPECT_EQ(10614, vfsbuf.blocks);
+  EXPECT_EQ(expected_blocks, vfsbuf.blocks);
   EXPECT_EQ(33 + 3 * has_devices, vfsbuf.files);
   EXPECT_TRUE(vfsbuf.readonly);
   EXPECT_GT(vfsbuf.namemax, 0);
@@ -1149,6 +1184,10 @@ void check_compat(logger& lgr, reader::filesystem_v2 const& fs,
   }
 }
 
+auto get_image_path(std::string const& version) {
+  return test_dir / "compat" / fmt::format("compat-v{}.dwarfs", version);
+}
+
 } // namespace
 
 class compat_metadata : public testing::TestWithParam<std::string> {};
@@ -1157,17 +1196,21 @@ void check_dynamic(std::string const& version,
                    reader::filesystem_v2 const& fs) {
   auto meta = fs.metadata_as_json();
   nlohmann::json ref;
-  if (version == "0.2.0" or version == "0.2.3") {
+  if (version.starts_with("0.2.")) {
     ref = nlohmann::json::parse(reference_v0_2);
   } else {
-    ref = nlohmann::json::parse(reference);
+    ref = nlohmann::json::parse(reference_v0_4);
   }
-  EXPECT_EQ(ref, meta);
+
+  remove_inode_numbers(ref);
+  remove_inode_numbers(meta);
+
+  EXPECT_EQ(ref, meta) << nlohmann::json::diff(ref, meta).dump(2);
 }
 
 TEST_P(compat_metadata, backwards_compat) {
   auto version = GetParam();
-  auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs";
+  auto filename = get_image_path(version);
   test::test_logger lgr;
   test::os_access_mock os;
   reader::filesystem_v2 fs(lgr, os, std::make_shared<mmap>(filename));
@@ -1185,7 +1228,7 @@ TEST_P(compat_filesystem, backwards_compat) {
 
   test::test_logger lgr;
   test::os_access_mock os;
-  auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs";
+  auto filename = get_image_path(version);
 
   reader::filesystem_options opts;
   opts.metadata.enable_nlink = enable_nlink;
@@ -1193,25 +1236,25 @@ TEST_P(compat_filesystem, backwards_compat) {
 
   {
     reader::filesystem_v2 fs(lgr, os, std::make_shared<mmap>(filename), opts);
-    check_compat(lgr, fs, version);
+    check_compat(lgr, fs, version, enable_nlink);
   }
 
   opts.image_offset = reader::filesystem_options::IMAGE_OFFSET_AUTO;
 
   std::string fsdata;
-  ASSERT_TRUE(folly::readFile(filename.c_str(), fsdata));
+  ASSERT_TRUE(folly::readFile(filename.string().c_str(), fsdata));
 
   for (auto const& hdr : headers) {
     reader::filesystem_v2 fs(
         lgr, os, std::make_shared<test::mmap_mock>(hdr + fsdata), opts);
-    check_compat(lgr, fs, version);
+    check_compat(lgr, fs, version, enable_nlink);
   }
 
   if (version != "0.2.0" and version != "0.2.3") {
     for (auto const& hdr : headers_v2) {
       reader::filesystem_v2 fs(
           lgr, os, std::make_shared<test::mmap_mock>(hdr + fsdata), opts);
-      check_compat(lgr, fs, version);
+      check_compat(lgr, fs, version, enable_nlink);
     }
   }
 }
@@ -1228,7 +1271,7 @@ TEST_P(rewrite, filesystem_rewrite) {
 
   test::test_logger lgr;
   test::os_access_mock os;
-  auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs";
+  auto filename = get_image_path(version);
 
   utility::rewrite_options opts;
   opts.recompress_block = recompress_block;
@@ -1377,7 +1420,7 @@ INSTANTIATE_TEST_SUITE_P(dwarfs_compat, rewrite,
 class set_uidgid_test : public testing::TestWithParam<char const*> {};
 
 TEST_P(set_uidgid_test, read_legacy_image) {
-  auto image = test_dir / GetParam();
+  auto image = test_dir / "compat" / GetParam();
 
   test::test_logger lgr;
   test::os_access_mock os;