Skip to content

Commit eda1e0c

Browse files
committed
refactor: TestMain for better handling of cleanup and testdatadir creation
1 parent 2e54372 commit eda1e0c

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

internal/certinfo/main_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,11 @@ var (
8787
func TestMain(m *testing.M) {
8888
fmt.Printf("Certinfo TestMain - check test data dir: %s\n", testdataDir)
8989

90-
if errDataDir := os.Mkdir(testdataDir, os.ModePerm); errDataDir != nil {
91-
fmt.Println(errDataDir)
90+
if errDataDir := os.MkdirAll(testdataDir, 0o755); errDataDir != nil {
91+
panic(errDataDir)
9292
}
9393

94-
systemCertPool, _ = x509.SystemCertPool()
95-
caCertPool = x509.NewCertPool()
96-
97-
generateRSACaData()
98-
caCertPool.AppendCertsFromPEM(RSACaCertPEM)
99-
100-
generateRSACertificateData()
101-
102-
// Cleanup
94+
// Cleanup (register early so panics in setup still clean up what was created)
10395
defer func() {
10496
filesToDel := []string{
10597
RSACaCertKeyFile,
@@ -119,6 +111,14 @@ func TestMain(m *testing.M) {
119111
}
120112
}()
121113

114+
systemCertPool, _ = x509.SystemCertPool()
115+
caCertPool = x509.NewCertPool()
116+
117+
generateRSACaData()
118+
caCertPool.AppendCertsFromPEM(RSACaCertPEM)
119+
120+
generateRSACertificateData()
121+
122122
m.Run()
123123
}
124124

@@ -259,7 +259,7 @@ func GenerateCertificate(tpl certificateTemplate) ([]byte, *x509.Certificate, er
259259

260260
// in case of CA cert we update the template with the proper fields
261261
// use the CA cert key for signing
262-
// and do not reference any previuous parent Certificate
262+
// and do not reference any previous parent Certificate
263263
if tpl.isCA {
264264
certParent = &template
265265
signingKey = tpl.key

0 commit comments

Comments
 (0)