Delete old ValidPathInfo test, fix UnkeyedValidPathInfo

The UnkeyedValidPathInfo test was testing an ancient version but not the
current version. Doesn't make much sense to me.

Change-Id: Ib476a4297d9075f2dcd31a073b3e7b149b2189af
This commit is contained in:
jade 2024-05-24 20:45:05 -06:00
parent a17282fc66
commit 24255748b4
5 changed files with 8 additions and 55 deletions

View file

@ -18,9 +18,9 @@ struct WorkerProtoTest : VersionedProtoTest<WorkerProto, workerProtoDir>
{ {
/** /**
* For serializers that don't care about the minimum version, we * For serializers that don't care about the minimum version, we
* used the oldest one: 1.0. * have to use the minimum supported to not throw an assert.
*/ */
WorkerProto::Version defaultVersion = 1 << 8 | 0; WorkerProto::Version defaultVersion = MIN_SUPPORTED_WORKER_PROTO_VERSION;
}; };
@ -331,9 +331,9 @@ VERSIONED_CHARACTERIZATION_TEST(
VERSIONED_CHARACTERIZATION_TEST( VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest, WorkerProtoTest,
unkeyedValidPathInfo_1_15, unkeyedValidPathInfo,
"unkeyed-valid-path-info-1.15", "unkeyed-valid-path-info",
1 << 8 | 15, defaultVersion,
(std::tuple<UnkeyedValidPathInfo, UnkeyedValidPathInfo> { (std::tuple<UnkeyedValidPathInfo, UnkeyedValidPathInfo> {
({ ({
UnkeyedValidPathInfo info { UnkeyedValidPathInfo info {
@ -363,56 +363,9 @@ VERSIONED_CHARACTERIZATION_TEST(
VERSIONED_CHARACTERIZATION_TEST( VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest, WorkerProtoTest,
validPathInfo_1_15, validPathInfo,
"valid-path-info-1.15", "valid-path-info",
1 << 8 | 15, defaultVersion,
(std::tuple<ValidPathInfo, ValidPathInfo> {
({
ValidPathInfo info {
StorePath {
"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
},
UnkeyedValidPathInfo {
Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
},
};
info.registrationTime = 23423;
info.narSize = 34878;
info;
}),
({
ValidPathInfo info {
StorePath {
"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
},
UnkeyedValidPathInfo {
Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
},
};
info.deriver = StorePath {
"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv",
};
info.references = {
// other reference
StorePath {
"g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo",
},
// self reference
StorePath {
"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
},
};
info.registrationTime = 23423;
info.narSize = 34878;
info;
}),
}))
VERSIONED_CHARACTERIZATION_TEST(
WorkerProtoTest,
validPathInfo_1_16,
"valid-path-info-1.16",
1 << 8 | 16,
(std::tuple<ValidPathInfo, ValidPathInfo, ValidPathInfo> { (std::tuple<ValidPathInfo, ValidPathInfo, ValidPathInfo> {
({ ({
ValidPathInfo info { ValidPathInfo info {