aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/libstore/common-protocol.cc73
-rw-r--r--tests/unit/libstore/protocol.hh45
-rw-r--r--tests/unit/libstore/serve-protocol.cc38
-rw-r--r--tests/unit/libstore/worker-protocol.cc49
4 files changed, 149 insertions, 56 deletions
diff --git a/tests/unit/libstore/common-protocol.cc b/tests/unit/libstore/common-protocol.cc
index ee54b2cd9..083970e41 100644
--- a/tests/unit/libstore/common-protocol.cc
+++ b/tests/unit/libstore/common-protocol.cc
@@ -13,10 +13,71 @@ namespace nix {
const char commonProtoDir[] = "common-protocol";
-using CommonProtoTest = ProtoTest<CommonProto, commonProtoDir>;
+class CommonProtoTest : public ProtoTest<CommonProto, commonProtoDir>
+{
+public:
+ /**
+ * Golden test for `T` reading
+ */
+ template<typename T>
+ void readTest(PathView testStem, T value)
+ {
+ if (testAccept())
+ {
+ GTEST_SKIP() << "Cannot read golden master because another test is also updating it";
+ }
+ else
+ {
+ auto expected = readFile(goldenMaster(testStem));
+
+ T got = ({
+ StringSource from { expected };
+ CommonProto::Serialise<T>::read(
+ *store,
+ CommonProto::ReadConn { .from = from });
+ });
+
+ ASSERT_EQ(got, value);
+ }
+ }
+
+ /**
+ * Golden test for `T` write
+ */
+ template<typename T>
+ void writeTest(PathView testStem, const T & value)
+ {
+ auto file = goldenMaster(testStem);
+
+ StringSink to;
+ CommonProto::write(
+ *store,
+ CommonProto::WriteConn { .to = to },
+ value);
+
+ if (testAccept())
+ {
+ createDirs(dirOf(file));
+ writeFile(file, to.s);
+ GTEST_SKIP() << "Updating golden master";
+ }
+ else
+ {
+ auto expected = readFile(file);
+ ASSERT_EQ(to.s, expected);
+ }
+ }
+};
+
+#define CHARACTERIZATION_TEST(NAME, STEM, VALUE) \
+ TEST_F(CommonProtoTest, NAME ## _read) { \
+ readTest(STEM, VALUE); \
+ } \
+ TEST_F(CommonProtoTest, NAME ## _write) { \
+ writeTest(STEM, VALUE); \
+ }
CHARACTERIZATION_TEST(
- CommonProtoTest,
string,
"string",
(std::tuple<std::string, std::string, std::string, std::string, std::string> {
@@ -28,7 +89,6 @@ CHARACTERIZATION_TEST(
}))
CHARACTERIZATION_TEST(
- CommonProtoTest,
storePath,
"store-path",
(std::tuple<StorePath, StorePath> {
@@ -37,7 +97,6 @@ CHARACTERIZATION_TEST(
}))
CHARACTERIZATION_TEST(
- CommonProtoTest,
contentAddress,
"content-address",
(std::tuple<ContentAddress, ContentAddress, ContentAddress> {
@@ -56,7 +115,6 @@ CHARACTERIZATION_TEST(
}))
CHARACTERIZATION_TEST(
- CommonProtoTest,
drvOutput,
"drv-output",
(std::tuple<DrvOutput, DrvOutput> {
@@ -71,7 +129,6 @@ CHARACTERIZATION_TEST(
}))
CHARACTERIZATION_TEST(
- CommonProtoTest,
realisation,
"realisation",
(std::tuple<Realisation, Realisation> {
@@ -103,7 +160,6 @@ CHARACTERIZATION_TEST(
}))
CHARACTERIZATION_TEST(
- CommonProtoTest,
vector,
"vector",
(std::tuple<std::vector<std::string>, std::vector<std::string>, std::vector<std::string>, std::vector<std::vector<std::string>>> {
@@ -114,7 +170,6 @@ CHARACTERIZATION_TEST(
}))
CHARACTERIZATION_TEST(
- CommonProtoTest,
set,
"set",
(std::tuple<std::set<std::string>, std::set<std::string>, std::set<std::string>, std::set<std::set<std::string>>> {
@@ -125,7 +180,6 @@ CHARACTERIZATION_TEST(
}))
CHARACTERIZATION_TEST(
- CommonProtoTest,
optionalStorePath,
"optional-store-path",
(std::tuple<std::optional<StorePath>, std::optional<StorePath>> {
@@ -136,7 +190,6 @@ CHARACTERIZATION_TEST(
}))
CHARACTERIZATION_TEST(
- CommonProtoTest,
optionalContentAddress,
"optional-content-address",
(std::tuple<std::optional<ContentAddress>, std::optional<ContentAddress>> {
diff --git a/tests/unit/libstore/protocol.hh b/tests/unit/libstore/protocol.hh
index 0df819090..6f0db89ac 100644
--- a/tests/unit/libstore/protocol.hh
+++ b/tests/unit/libstore/protocol.hh
@@ -9,26 +9,23 @@ namespace nix {
template<class Proto, const char * protocolDir>
class ProtoTest : public LibStoreTest
{
- /**
- * Read this as simply `using S = Inner::Serialise;`.
- *
- * See `LengthPrefixedProtoHelper::S` for the same trick, and its
- * rationale.
- */
- template<typename U> using S = typename Proto::template Serialise<U>;
-
-public:
+protected:
Path unitTestData = getUnitTestData() + "/libstore/" + protocolDir;
Path goldenMaster(std::string_view testStem) {
return unitTestData + "/" + testStem + ".bin";
}
+};
+template<class Proto, const char * protocolDir>
+class VersionedProtoTest : public ProtoTest<Proto, protocolDir>
+{
+public:
/**
* Golden test for `T` reading
*/
template<typename T>
- void readTest(PathView testStem, T value)
+ void readTest(PathView testStem, typename Proto::Version version, T value)
{
if (testAccept())
{
@@ -36,13 +33,16 @@ public:
}
else
{
- auto expected = readFile(goldenMaster(testStem));
+ auto expected = readFile(ProtoTest<Proto, protocolDir>::goldenMaster(testStem));
T got = ({
StringSource from { expected };
- S<T>::read(
- *store,
- typename Proto::ReadConn { .from = from });
+ Proto::template Serialise<T>::read(
+ *LibStoreTest::store,
+ typename Proto::ReadConn {
+ .from = from,
+ .version = version,
+ });
});
ASSERT_EQ(got, value);
@@ -53,14 +53,17 @@ public:
* Golden test for `T` write
*/
template<typename T>
- void writeTest(PathView testStem, const T & value)
+ void writeTest(PathView testStem, typename Proto::Version version, const T & value)
{
- auto file = goldenMaster(testStem);
+ auto file = ProtoTest<Proto, protocolDir>::goldenMaster(testStem);
StringSink to;
Proto::write(
- *store,
- typename Proto::WriteConn { .to = to },
+ *LibStoreTest::store,
+ typename Proto::WriteConn {
+ .to = to,
+ .version = version,
+ },
value);
if (testAccept())
@@ -77,12 +80,12 @@ public:
}
};
-#define CHARACTERIZATION_TEST(FIXTURE, NAME, STEM, VALUE) \
+#define VERSIONED_CHARACTERIZATION_TEST(FIXTURE, NAME, STEM, VERSION, VALUE) \
TEST_F(FIXTURE, NAME ## _read) { \
- readTest(STEM, VALUE); \
+ readTest(STEM, VERSION, VALUE); \
} \
TEST_F(FIXTURE, NAME ## _write) { \
- writeTest(STEM, VALUE); \
+ writeTest(STEM, VERSION, VALUE); \
}
}
diff --git a/tests/unit/libstore/serve-protocol.cc b/tests/unit/libstore/serve-protocol.cc
index dd7d83e0a..8146ea895 100644
--- a/tests/unit/libstore/serve-protocol.cc
+++ b/tests/unit/libstore/serve-protocol.cc
@@ -11,14 +11,22 @@
namespace nix {
-const char commonProtoDir[] = "serve-protocol";
+const char serveProtoDir[] = "serve-protocol";
-using ServeProtoTest = ProtoTest<ServeProto, commonProtoDir>;
+struct ServeProtoTest : VersionedProtoTest<ServeProto, serveProtoDir>
+{
+ /**
+ * For serializers that don't care about the minimum version, we
+ * used the oldest one: 1.0.
+ */
+ ServeProto::Version defaultVersion = 1 << 8 | 0;
+};
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
ServeProtoTest,
string,
"string",
+ defaultVersion,
(std::tuple<std::string, std::string, std::string, std::string, std::string> {
"",
"hi",
@@ -27,19 +35,21 @@ CHARACTERIZATION_TEST(
"oh no \0\0\0 what was that!",
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
ServeProtoTest,
storePath,
"store-path",
+ defaultVersion,
(std::tuple<StorePath, StorePath> {
StorePath { "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo" },
StorePath { "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar" },
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
ServeProtoTest,
contentAddress,
"content-address",
+ defaultVersion,
(std::tuple<ContentAddress, ContentAddress, ContentAddress> {
ContentAddress {
.method = TextIngestionMethod {},
@@ -55,10 +65,11 @@ CHARACTERIZATION_TEST(
},
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
ServeProtoTest,
drvOutput,
"drv-output",
+ defaultVersion,
(std::tuple<DrvOutput, DrvOutput> {
{
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
@@ -70,10 +81,11 @@ CHARACTERIZATION_TEST(
},
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
ServeProtoTest,
realisation,
"realisation",
+ defaultVersion,
(std::tuple<Realisation, Realisation> {
Realisation {
.id = DrvOutput {
@@ -102,10 +114,11 @@ CHARACTERIZATION_TEST(
},
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
ServeProtoTest,
vector,
"vector",
+ defaultVersion,
(std::tuple<std::vector<std::string>, std::vector<std::string>, std::vector<std::string>, std::vector<std::vector<std::string>>> {
{ },
{ "" },
@@ -113,10 +126,11 @@ CHARACTERIZATION_TEST(
{ {}, { "" }, { "", "1", "2" } },
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
ServeProtoTest,
set,
"set",
+ defaultVersion,
(std::tuple<std::set<std::string>, std::set<std::string>, std::set<std::string>, std::set<std::set<std::string>>> {
{ },
{ "" },
@@ -124,10 +138,11 @@ CHARACTERIZATION_TEST(
{ {}, { "" }, { "", "1", "2" } },
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
ServeProtoTest,
optionalStorePath,
"optional-store-path",
+ defaultVersion,
(std::tuple<std::optional<StorePath>, std::optional<StorePath>> {
std::nullopt,
std::optional {
@@ -135,10 +150,11 @@ CHARACTERIZATION_TEST(
},
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
ServeProtoTest,
optionalContentAddress,
"optional-content-address",
+ defaultVersion,
(std::tuple<std::optional<ContentAddress>, std::optional<ContentAddress>> {
std::nullopt,
std::optional {
diff --git a/tests/unit/libstore/worker-protocol.cc b/tests/unit/libstore/worker-protocol.cc
index 5c3faaae2..6e7f47168 100644
--- a/tests/unit/libstore/worker-protocol.cc
+++ b/tests/unit/libstore/worker-protocol.cc
@@ -14,12 +14,21 @@ namespace nix {
const char workerProtoDir[] = "worker-protocol";
-using WorkerProtoTest = ProtoTest<WorkerProto, workerProtoDir>;
+struct WorkerProtoTest : VersionedProtoTest<WorkerProto, workerProtoDir>
+{
+ /**
+ * For serializers that don't care about the minimum version, we
+ * used the oldest one: 1.0.
+ */
+ WorkerProto::Version defaultVersion = 1 << 8 | 0;
+};
-CHARACTERIZATION_TEST(
+
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
string,
"string",
+ defaultVersion,
(std::tuple<std::string, std::string, std::string, std::string, std::string> {
"",
"hi",
@@ -28,19 +37,21 @@ CHARACTERIZATION_TEST(
"oh no \0\0\0 what was that!",
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
storePath,
"store-path",
+ defaultVersion,
(std::tuple<StorePath, StorePath> {
StorePath { "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo" },
StorePath { "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar" },
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
contentAddress,
"content-address",
+ defaultVersion,
(std::tuple<ContentAddress, ContentAddress, ContentAddress> {
ContentAddress {
.method = TextIngestionMethod {},
@@ -56,10 +67,11 @@ CHARACTERIZATION_TEST(
},
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
derivedPath,
"derived-path",
+ defaultVersion,
(std::tuple<DerivedPath, DerivedPath> {
DerivedPath::Opaque {
.path = StorePath { "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo" },
@@ -72,10 +84,11 @@ CHARACTERIZATION_TEST(
},
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
drvOutput,
"drv-output",
+ defaultVersion,
(std::tuple<DrvOutput, DrvOutput> {
{
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
@@ -87,10 +100,11 @@ CHARACTERIZATION_TEST(
},
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
realisation,
"realisation",
+ defaultVersion,
(std::tuple<Realisation, Realisation> {
Realisation {
.id = DrvOutput {
@@ -119,10 +133,11 @@ CHARACTERIZATION_TEST(
},
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
buildResult,
"build-result",
+ defaultVersion,
({
using namespace std::literals::chrono_literals;
std::tuple<BuildResult, BuildResult, BuildResult> t {
@@ -177,10 +192,11 @@ CHARACTERIZATION_TEST(
t;
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
keyedBuildResult,
"keyed-build-result",
+ defaultVersion,
({
using namespace std::literals::chrono_literals;
std::tuple<KeyedBuildResult, KeyedBuildResult/*, KeyedBuildResult*/> t {
@@ -213,20 +229,22 @@ CHARACTERIZATION_TEST(
t;
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
optionalTrustedFlag,
"optional-trusted-flag",
+ defaultVersion,
(std::tuple<std::optional<TrustedFlag>, std::optional<TrustedFlag>, std::optional<TrustedFlag>> {
std::nullopt,
std::optional { Trusted },
std::optional { NotTrusted },
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
vector,
"vector",
+ defaultVersion,
(std::tuple<std::vector<std::string>, std::vector<std::string>, std::vector<std::string>, std::vector<std::vector<std::string>>> {
{ },
{ "" },
@@ -234,10 +252,11 @@ CHARACTERIZATION_TEST(
{ {}, { "" }, { "", "1", "2" } },
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
set,
"set",
+ defaultVersion,
(std::tuple<std::set<std::string>, std::set<std::string>, std::set<std::string>, std::set<std::set<std::string>>> {
{ },
{ "" },
@@ -245,10 +264,11 @@ CHARACTERIZATION_TEST(
{ {}, { "" }, { "", "1", "2" } },
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
optionalStorePath,
"optional-store-path",
+ defaultVersion,
(std::tuple<std::optional<StorePath>, std::optional<StorePath>> {
std::nullopt,
std::optional {
@@ -256,10 +276,11 @@ CHARACTERIZATION_TEST(
},
}))
-CHARACTERIZATION_TEST(
+VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
optionalContentAddress,
"optional-content-address",
+ defaultVersion,
(std::tuple<std::optional<ContentAddress>, std::optional<ContentAddress>> {
std::nullopt,
std::optional {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 04:26:35 +0000