From d0385ced87ac50bfff4d3c13b868829186ec8fb7 Mon Sep 17 00:00:00 2001
From: Fang <git@fang.io>
Date: Thu, 8 Aug 2019 22:17:17 -0700
Subject: [PATCH] Ensure expected eyre test results always up-to-date

By dynamically generating the content-length headers for the expected
results, based on their actual content.
---
 pkg/arvo/tests/sys/vane/eyre.hoon | 59 ++++++++++++++++---------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/pkg/arvo/tests/sys/vane/eyre.hoon b/pkg/arvo/tests/sys/vane/eyre.hoon
index 7eb63f96c9..7b0b3641dc 100644
--- a/pkg/arvo/tests/sys/vane/eyre.hoon
+++ b/pkg/arvo/tests/sys/vane/eyre.hoon
@@ -208,12 +208,11 @@
                 %give
                 %response
                 %start
-                :-  404
-                :~  ['content-type' 'text/html']
-                    ['content-length' '156']
-                ==
+              ::
+                %+  complete-http-start-event
+                  :-  404
+                  ['content-type' 'text/html']~
                 [~ (error-page:http-server-gate 404 %.n '/' ~)]
-                complete=%.y
         ==  ==
     ==
   ::
@@ -384,12 +383,11 @@
       ^=  expected-move
         :~  :*  duct=~[/http-blah]  %give  %response
                 %start
-                :-  500
-                :~  ['content-type' 'text/html']
-                    ['content-length' '180']
-                ==
+              ::
+                %+  complete-http-start-event
+                  :-  500
+                  ['content-type' 'text/html']~
                 [~ (internal-server-error:http-server-gate %.n '/' ~)]
-                complete=%.y
     ==  ==  ==
   ::
   ;:  weld
@@ -736,14 +734,13 @@
          ==
       ^=  expected-move
         :~  :*  duct=~[/http-blah]  %give  %response
-                :*  %start
-                    :-  200
-                    :~  ['content-type' 'text/plain']
-                        ['content-length' '13']
-                    ==
-                    `[13 'one two three']
-                    %.y
-    ==  ==  ==  ==
+                %start
+              ::
+                %+  complete-http-start-event
+                  :-  200
+                  ['content-type' 'text/plain']~
+                `[13 'one two three']
+    ==  ==  ==
   ::
   ;:  weld
     results1
@@ -870,11 +867,10 @@
                 %give
                 %response
                 %start
-                :-  403
-                :~  ['content-type' 'text/html']
-                    ['content-length' '182']
-                ==
               ::
+                %+  complete-http-start-event
+                  :-  403
+                  ['content-type' 'text/html']~
                 :-  ~
                 %-  error-page:http-server-gate  :*
                   403
@@ -882,8 +878,6 @@
                   '/~/channel/1234567890abcdef'
                   ~
                 ==
-              ::
-                complete=%.y
         ==  ==
     ==
   ::
@@ -2050,12 +2044,11 @@
                 %give
                 %response
                 %start
-                :-  200
-                :~  ['content-type' 'text/html']
-                    ['content-length' '1752']
-                ==
+              ::
+                %+  complete-http-start-event
+                  :-  200
+                  ['content-type' 'text/html']~
                 [~ (login-page:http-server-gate `'/~landscape/inner-path' ~nul)]
-                complete=%.y
         ==  ==
     ==
   ::  a response post redirects back to the application, setting cookie
@@ -2201,4 +2194,12 @@
   ::  This is the default code for a fakeship.
   ::
   [~ ~ %noun !>(.~lidlut-tabwed-savheb-loslux)]
+::  produce the body of a %start http-event with the correct content-length
+::
+++  complete-http-start-event
+  |=  [response-header:http data=(unit octs)]
+  =-  [[status-code -] data %.y]
+  ?~  data  headers
+  %+  weld  headers
+  ['content-length' (crip ((d-co:co 1) p.u.data))]~
 --