Skip to content

Commit fd9bdc7

Browse files
committed
Make ghe-restore test failure output less noisy
Show ghe-restore output once instead of with each grep invocation.
1 parent f5e8a2d commit fd9bdc7

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

test/test-ghe-restore.sh

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,21 @@ begin_test "ghe-restore"
5555
GHE_RESTORE_HOST=127.0.0.1
5656
export GHE_RESTORE_HOST
5757

58-
# run it
59-
output="$(ghe-restore -v)" || false
58+
# run ghe-restore and write output to file for asserting against
59+
ghe-restore -v > "$TRASHDIR/restore-out"
60+
cat "$TRASHDIR/restore-out"
6061

6162
# verify connect to right host
62-
echo "$output" | grep -q 'Connect 127.0.0.1 OK'
63+
grep -q "Connect 127.0.0.1 OK" "$TRASHDIR/restore-out"
6364

6465
# verify all import scripts were run
65-
echo "$output" | grep -q 'alice/index.html'
66-
echo "$output" | grep -q 'fake ghe-export-mysql data'
67-
echo "$output" | grep -q 'fake ghe-export-redis data'
68-
echo "$output" | grep -q 'fake ghe-export-authorized-keys data'
69-
echo "$output" | grep -q 'fake ghe-export-ssh-host-keys data'
70-
echo "$output" | grep -q 'fake ghe-export-settings data'
71-
echo "$output" | grep -q 'ghe-import-es-indices'
66+
grep -q "alice/index.html" "$TRASHDIR/restore-out"
67+
grep -q "fake ghe-export-mysql data" "$TRASHDIR/restore-out"
68+
grep -q "fake ghe-export-redis data" "$TRASHDIR/restore-out"
69+
grep -q "fake ghe-export-authorized-keys data" "$TRASHDIR/restore-out"
70+
grep -q "fake ghe-export-ssh-host-keys data" "$TRASHDIR/restore-out"
71+
grep -q "fake ghe-export-settings data" "$TRASHDIR/restore-out"
72+
grep -q "ghe-import-es-indices" "$TRASHDIR/restore-out"
7273

7374
# verify all repository data was transferred to the restore location
7475
diff -ru "$GHE_DATA_DIR/current/repositories" "$GHE_REMOTE_DATA_USER_DIR/repositories"

0 commit comments

Comments
 (0)