Move skip function to individual unit tests

ycombinator · ycombinator · commit d0cff30828fa · 2025-12-04T19:56:14.000-08:00
diff --git a/config/configtls/tpm_test.go b/config/configtls/tpm_test.go
@@ -33,6 +33,7 @@ import (
 )
 
 func TestTPM_loadCertificate(t *testing.T) {
+	testutil.SkipIfFIPSOnly(t, "use of CFB is not allowed in FIPS 140-only mode")
 	tpm, err := simulator.OpenSimulator()
 	require.NoError(t, err)
 	defer tpm.Close()
@@ -100,6 +101,7 @@ func TestTPM_loadCertificate_error(t *testing.T) {
 }
 
 func TestTPM_tpmCertificate_errors(t *testing.T) {
+	testutil.SkipIfFIPSOnly(t, "use of CFB is not allowed in FIPS 140-only mode")
 	tpm, err := simulator.OpenSimulator()
 	require.NoError(t, err)
 	defer tpm.Close()
@@ -190,7 +192,6 @@ func TestTPM_open(t *testing.T) {
 }
 
 func createTPMKeyCert(t *testing.T, tpm transport.TPMCloser) ([]byte, []byte) {
-	testutil.SkipIfFIPSOnly(t, "use of CFB is not allowed in FIPS 140-only mode")
 	tpmKey, err := keyfile.NewLoadableKey(tpm, tpm2.TPMAlgECC, 256, []byte(""))
 	require.NoError(t, err)
 	tpmKeySigner, err := tpmKey.Signer(tpm, []byte(""), []byte(""))

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ import (`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`func TestTPM_loadCertificate(t *testing.T) {`
	`36`	`+ testutil.SkipIfFIPSOnly(t, "use of CFB is not allowed in FIPS 140-only mode")`
`36`	`37`	`tpm, err := simulator.OpenSimulator()`
`37`	`38`	`require.NoError(t, err)`
`38`	`39`	`defer tpm.Close()`
`@@ -100,6 +101,7 @@ func TestTPM_loadCertificate_error(t *testing.T) {`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`func TestTPM_tpmCertificate_errors(t *testing.T) {`
	`104`	`+ testutil.SkipIfFIPSOnly(t, "use of CFB is not allowed in FIPS 140-only mode")`
`103`	`105`	`tpm, err := simulator.OpenSimulator()`
`104`	`106`	`require.NoError(t, err)`
`105`	`107`	`defer tpm.Close()`
`@@ -190,7 +192,6 @@ func TestTPM_open(t *testing.T) {`
`190`	`192`	`}`
`191`	`193`
`192`	`194`	`func createTPMKeyCert(t *testing.T, tpm transport.TPMCloser) ([]byte, []byte) {`
`193`		`- testutil.SkipIfFIPSOnly(t, "use of CFB is not allowed in FIPS 140-only mode")`
`194`	`195`	`tpmKey, err := keyfile.NewLoadableKey(tpm, tpm2.TPMAlgECC, 256, []byte(""))`
`195`	`196`	`require.NoError(t, err)`
`196`	`197`	`tpmKeySigner, err := tpmKey.Signer(tpm, []byte(""), []byte(""))`