Merge pull request #9098 from obsidiansystems/test-proto

Enable most of the third `BuildResult` worker protocol test

(cherry picked from commit d344c112f772282bacacd4c66a75df4022d16e12)
Change-Id: I7b2b72aa84c19a6069f9c12128d901262db6f91c
This commit is contained in:
eldritch horrors 2024-03-04 03:49:09 +01:00
parent ea0008deea
commit 7e966819b5
2 changed files with 6 additions and 5 deletions

View file

@ -187,7 +187,7 @@ CHARACTERIZATION_TEST(
"build-result", "build-result",
({ ({
using namespace std::literals::chrono_literals; using namespace std::literals::chrono_literals;
std::tuple<BuildResult, BuildResult/*, BuildResult*/> t { std::tuple<BuildResult, BuildResult, BuildResult> t {
BuildResult { BuildResult {
.status = BuildResult::OutputRejected, .status = BuildResult::OutputRejected,
.errorMsg = "no idea why", .errorMsg = "no idea why",
@ -200,9 +200,6 @@ CHARACTERIZATION_TEST(
.startTime = 30, .startTime = 30,
.stopTime = 50, .stopTime = 50,
}, },
#if 0
// This is commented because this test would fail!
// FIXME uncomment this and fix the underlying bug.
BuildResult { BuildResult {
.status = BuildResult::Built, .status = BuildResult::Built,
.timesBuilt = 1, .timesBuilt = 1,
@ -230,10 +227,14 @@ CHARACTERIZATION_TEST(
}, },
.startTime = 30, .startTime = 30,
.stopTime = 50, .stopTime = 50,
#if 0
// These fields are not yet serialized.
// FIXME Include in next version of protocol or document
// why they are skipped.
.cpuUser = std::chrono::milliseconds(500s), .cpuUser = std::chrono::milliseconds(500s),
.cpuSystem = std::chrono::milliseconds(604s), .cpuSystem = std::chrono::milliseconds(604s),
},
#endif #endif
},
}; };
t; t;
})) }))