From 7e966819b59d968366a9df50bfaa7c7abd36d61e Mon Sep 17 00:00:00 2001
From: eldritch horrors <pennae@lix.systems>
Date: Mon, 4 Mar 2024 03:49:09 +0100
Subject: [PATCH] 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
---
 tests/unit/libstore/worker-protocol.cc          |  11 ++++++-----
 .../libstore/worker-protocol/build-result.bin   | Bin 144 -> 744 bytes
 2 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;
     }))
diff --git a/unit-test-data/libstore/worker-protocol/build-result.bin b/unit-test-data/libstore/worker-protocol/build-result.bin
index f981fd91f7f32724dc2b9ce1938398aad3d73cdf..b02c706eab8de4d60eadd6afdcc2c888ab605ad3 100644
GIT binary patch
literal 744
zcmc(b&uRiO5XSolPxTp!=B%)rxXHS&(2IC2J<K{2H&BvxH;ah)PJP4%9WTN{1);h8
zLcW=ACg14cd|sG7OdJwScFmq&{)RD^4f#B?{>Xe~O6CwQ^%woR?}>#sX4il$bfs;n
zmv%`YOQ~vvTo;t-%xH@l(n4vSK8bRZQHc`kI^B)Ih0TkNGRhXy8rqZN5BnYj(ieFo
zAJ+t*u7l`;??iPt&V)lzi91dfGZFf@g4iVAZN4+jUVRU7o>ol_o!fedeM@Pl_mAVf
T^ROZOQyyvZZF!s<uJZT=xp}90

delta 6
NcmaFCI)QP*1ON$w0-pc?