From 691cd8d99b7c8fb897db8d576e43fd28ee3e242f Mon Sep 17 00:00:00 2001
From: John Mulligan <jmulligan@redhat.com>
Date: Mon, 3 Feb 2020 14:14:17 -0500
Subject: [PATCH] entrypoint: move pre- and post- test code into functions

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---
 entrypoint.sh | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index e0d3b4a..f5609d1 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -70,6 +70,22 @@ test_pkg() {
     grep -v "^mode: count" "$pkg.cover.out" >> "cover.out"
 }
 
+pre_all_tests() {
+    # Prepare Go code
+    go get -t -v ./...
+    diff -u <(echo -n) <(gofmt -d -s .)
+
+    # TODO: Consider enabling go vet but it currently fails
+
+    # Reset whole-module coverage file
+    echo "mode: count" > "cover.out"
+}
+
+post_all_tests() {
+    mkdir -p /results/coverage
+    go tool cover -html=cover.out -o /results/coverage/go-ceph.html
+}
+
 test_go_ceph() {
     mkdir -p /tmp/ceph
     "${MICRO_OSD_PATH}" /tmp/ceph
@@ -80,11 +96,6 @@ test_go_ceph() {
         return 0
     fi
 
-    go get -t -v ./...
-    diff -u <(echo -n) <(gofmt -d -s .)
-    #go vet ./...
-    #go list ./...
-    echo "mode: count" > "cover.out"
     P=github.com/ceph/go-ceph
     pkgs=(\
         "cephfs" \
@@ -92,11 +103,11 @@ test_go_ceph() {
         "rados" \
         "rbd" \
         )
+    pre_all_tests
     for pkg in "${pkgs[@]}"; do
         test_pkg "$pkg"
     done
-    mkdir -p /results/coverage
-    go tool cover -html=cover.out -o /results/coverage/go-ceph.html
+    post_all_tests
 }
 
 pause_if_needed() {