x

.github/workflows/goproxy.yml

@@ -29,4 +29,5 @@ jobs:
         with:
           go-version: "${{ matrix.goversion }}"
 
+      # Verify that we can build when using the goproxy subcommand
       - run: go run ./internal/cmd/buildtool goproxy go run ./internal/cmd/buildtool generic miniooni

internal/cmd/buildtool/golang.go

@@ -5,7 +5,6 @@ package main
 //
 
 import (
-	"os"
 	"strings"
 
 	"github.com/apex/log"
@@ -27,15 +26,9 @@ func golangCorrectVersionCheckP(filename string) bool {
 	return true
 }
 
-// golangOsExit allows to test that [golangCheck] invokes [os.Exit] with exit code 1
-// whenever the version of golang is not the intended one.
-var golangOsExit = os.Exit
-
 // golangCheck checks whether the "go" binary is the correct version
 func golangCheck(filename string) {
-	if !golangCorrectVersionCheckP(filename) {
-		golangOsExit(1)
-	}
+	runtimex.Assert(golangCorrectVersionCheckP(filename), "invalid Go version")
 }
 
 // golangGOPATH returns the GOPATH value.

internal/cmd/buildtool/golang_test.go

@@ -6,6 +6,23 @@ import (
 )
 
 func TestGolangCheck(t *testing.T) {
-	// make sure the code does not panic when it runs
-	golangCheck(filepath.Join("..", "..", "..", "GOVERSION"))
+	t.Run("successful case", func(t *testing.T) {
+		// make sure the code does not panic when it runs
+		golangCheck(filepath.Join("..", "..", "..", "GOVERSION"))
+	})
+
+	t.Run("invalid Go version", func(t *testing.T) {
+		var panicked bool
+		func() {
+			defer func() {
+				if recover() != nil {
+					panicked = true
+				}
+			}()
+			golangCheck(filepath.Join("testdata", "GOVERSION"))
+		}()
+		if !panicked {
+			t.Fatal("should have panicked")
+		}
+	})
 }

internal/cmd/buildtool/testdata/GOVERSION

@@ -0,0 +1 @@
+1.17.11