aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-03-04 03:49:09 +0100
committereldritch horrors <pennae@lix.systems>2024-03-04 04:36:28 +0100
commit7e966819b59d968366a9df50bfaa7c7abd36d61e (patch)
tree524e549cb1fd2057caf3aa7342c0dd28ccf224ce /tests
parentea0008deea7769541fdbf7629bbeb8e9581d73a7 (diff)
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
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/libstore/worker-protocol.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/unit/libstore/worker-protocol.cc b/tests/unit/libstore/worker-protocol.cc
index 24a06503c..fa7cbe121 100644
--- a/tests/unit/libstore/worker-protocol.cc
+++ b/tests/unit/libstore/worker-protocol.cc
@@ -187,7 +187,7 @@ CHARACTERIZATION_TEST(
"build-result",
({
using namespace std::literals::chrono_literals;
- std::tuple<BuildResult, BuildResult/*, BuildResult*/> t {
+ std::tuple<BuildResult, BuildResult, BuildResult> t {
BuildResult {
.status = BuildResult::OutputRejected,
.errorMsg = "no idea why",
@@ -200,9 +200,6 @@ CHARACTERIZATION_TEST(
.startTime = 30,
.stopTime = 50,
},
-#if 0
- // This is commented because this test would fail!
- // FIXME uncomment this and fix the underlying bug.
BuildResult {
.status = BuildResult::Built,
.timesBuilt = 1,
@@ -230,10 +227,14 @@ CHARACTERIZATION_TEST(
},
.startTime = 30,
.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),
.cpuSystem = std::chrono::milliseconds(604s),
- },
#endif
+ },
};
t;
}))