test: Add retry to the correct part that has sync enabled (#5688)

Author: lucasmrod

pkg/nettest/nettest.go

@@ -62,7 +62,8 @@ func Retryable(err error) bool {
 	}
 	// Using the exact same error check used in:
 	// https://github.com/golang/go/blob/a5d61be040ed20b5774bff1b6b578c6d393ab332/src/net/http/serve_test.go#L1417
-	if errStr := err.Error(); strings.Contains(errStr, "timeout") && strings.Contains(errStr, "TLS handshake") {
+	if errStr := err.Error(); (strings.Contains(errStr, "timeout") && strings.Contains(errStr, "TLS handshake")) ||
+		strings.Contains(errStr, "unexpected EOF") {
 		return true
 	}
 	return false

server/vulnerabilities/cve_test.go

@@ -61,6 +61,18 @@ func (d *threadSafeDSMock) InsertCVEForCPE(ctx context.Context, cve string, cpes
 	return d.Store.InsertCVEForCPE(ctx, cve, cpes)
 }
 
+func withNetRetry(t *testing.T, fn func() error) error {
+	for {
+		err := fn()
+		if err != nil && nettest.Retryable(err) {
+			time.Sleep(5 * time.Second)
+			t.Logf("%s: retrying error: %s", t.Name(), err)
+			continue
+		}
+		return err
+	}
+}
+
 func TestTranslateCPEToCVE(t *testing.T) {
 	nettest.Run(t)
 
@@ -71,7 +83,9 @@ func TestTranslateCPEToCVE(t *testing.T) {
 
 	// download the CVEs once for all sub-tests, and then disable syncing
 	cfg := config.FleetConfig{}
-	err := SyncCVEData(tempDir, cfg)
+	err := withNetRetry(t, func() error {
+		return SyncCVEData(tempDir, cfg)
+	})
 	require.NoError(t, err)
 	cfg.Vulnerabilities.DisableDataSync = true
 	cfg.Vulnerabilities.RecentVulnerabilityMaxAge = 365 * 24 * time.Hour
@@ -93,14 +107,8 @@ func TestTranslateCPEToCVE(t *testing.T) {
 				return 0, nil
 			}
 
-			for {
-				_, err := TranslateCPEToCVE(ctx, ds, tempDir, kitlog.NewLogfmtLogger(os.Stdout), cfg, false)
-				if err != nil && nettest.Retryable(err) {
-					continue
-				}
-				require.NoError(t, err)
-				break
-			}
+			_, err := TranslateCPEToCVE(ctx, ds, tempDir, kitlog.NewLogfmtLogger(os.Stdout), cfg, false)
+			require.NoError(t, err)
 
 			printMemUsage()