lockbox

commit 20d45a34f368a7e20a1d8bf91a81eae75a057cee
parent 905408041d4a7c195c0952cb02fd6723bd7c760e
Author: Sean Enck <sean@ttypty.com>
Date:   Sun, 12 Mar 2023 10:28:06 -0400

fixing up tests a bit

Diffstat:
M
.github/workflows/build.yml
 | 
2
+-
M
tests/run.sh
 | 
10
+++++++---

2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: "deps"
-        run: apk add go make git
+        run: apk add go make git bash
       - name: "build"
         run: make .runci
   ubuntu-build:
diff --git a/tests/run.sh b/tests/run.sh
@@ -101,14 +101,18 @@ _cleanup() {
   find "$DATA" -type f -delete
 }
 
+_logtest() {
+  _execute 2>&1 | \
+    sed 's/modtime: [0-9].*$/modtime: XXXX-XX-XX/g' | \
+    sed 's/^[0-9][0-9][0-9][0-9][0-9][0-9]$/XXXXXX/g'
+}
+
 _evaluate() {
   local logfile
   logfile="$DATA/actual.log"
   echo "$1"
   echo "============"
-  _execute > "$logfile" 2>&1
-  sed -i 's/modtime: [0-9].*$/modtime: XXXX-XX-XX/g' "$logfile"
-  sed -i 's/^[0-9][0-9][0-9][0-9][0-9][0-9]$/XXXXXX/g' "$logfile"
+  _logtest > "$logfile"
   if ! diff -u "$logfile" "expected.log"; then
     echo "failed"
     exit 1