pin gocovmerge, factor out stripCoverageOutput

Signed-off-by: Ceridwen Driskill <cdriskill@google.com>
sigstore · Sep 23, 2022 · a62fbc6 · a62fbc6
1 parent 7e4a588
commit a62fbc6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -80,7 +80,7 @@ jobs:
         with:
           go-version: ${{ env.GOVERSION }}
       - name: install gocovmerge
-        run: go install github.com/wadey/gocovmerge@latest
+        run: go install github.com/wadey/gocovmerge@b5bfa59ec0adc420475f97f89b58045c721d761c
 
       - name: CLI
         run: ./tests/e2e-test.sh

diff --git a/tests/util.go b/tests/util.go
@@ -63,9 +63,7 @@ func run(t *testing.T, stdin, cmd string, arg ...string) string {
 		t.Log(string(b))
 		t.Fatal(err)
 	}
-
-	// Remove test coverage output
-	return strings.Split(strings.Split(string(b), "PASS")[0], "FAIL")[0]
+	return stripCoverageOutput(string(b))
 }
 
 func runCli(t *testing.T, arg ...string) string {
@@ -95,8 +93,7 @@ func runCliStdout(t *testing.T, arg ...string) string {
 		t.Log(string(b))
 		t.Fatal(err)
 	}
-	// Remove test coverage output
-	return strings.Split(strings.Split(string(b), "PASS")[0], "FAIL")[0]
+	return stripCoverageOutput(string(b))
 }
 
 func runCliErr(t *testing.T, arg ...string) string {
@@ -115,8 +112,7 @@ func runCliErr(t *testing.T, arg ...string) string {
 		t.Log(string(b))
 		t.Fatalf("expected error, got %s", string(b))
 	}
-	// Remove test coverage output
-	return strings.Split(strings.Split(string(b), "PASS")[0], "FAIL")[0]
+	return stripCoverageOutput(string(b))
 }
 
 func rekorServerFlag() string {
@@ -134,6 +130,10 @@ func coverageFlag() string {
 	return "-test.coverprofile=/tmp/rekor-cli."+randomSuffix(8)+".cov"
 }
 
+func stripCoverageOutput(out string) string {
+	return strings.Split(strings.Split(out, "PASS")[0], "FAIL")[0]
+}
+
 func readFile(t *testing.T, p string) string {
 	b, err := ioutil.ReadFile(p)
 	if err != nil {