Skip TestActions for Auditbeat on darwin/amd64 (#24648)

andrewkroh · web-flow · commit c33ad9ef736b · 2021-03-18T18:19:31.000-04:00
This skips TestActions, TestExcludedFiles, and TestIncludedExcludedFiles on darwin/amd64. I could not reproduce this on my local macbook, but it's failing in the CI environment. #24637
diff --git a/auditbeat/module/file_integrity/metricset_test.go b/auditbeat/module/file_integrity/metricset_test.go
@@ -65,6 +65,8 @@ func TestData(t *testing.T) {
 }
 
 func TestActions(t *testing.T) {
+	skipOnCIForDarwinAMD64(t)
+
 	defer abtest.SetupDataDir(t)()
 
 	bucket, err := datastore.OpenBucket(bucketName)
@@ -173,6 +175,8 @@ func TestActions(t *testing.T) {
 }
 
 func TestExcludedFiles(t *testing.T) {
+	skipOnCIForDarwinAMD64(t)
+
 	defer abtest.SetupDataDir(t)()
 
 	bucket, err := datastore.OpenBucket(bucketName)
@@ -227,6 +231,8 @@ func TestExcludedFiles(t *testing.T) {
 }
 
 func TestIncludedExcludedFiles(t *testing.T) {
+	skipOnCIForDarwinAMD64(t)
+
 	defer abtest.SetupDataDir(t)()
 
 	bucket, err := datastore.OpenBucket(bucketName)
@@ -980,3 +986,9 @@ func getConfig(path ...string) map[string]interface{} {
 		"exclude_files": []string{`(?i)\.sw[nop]$`, `[/\\]\.git([/\\]|$)`},
 	}
 }
+
+func skipOnCIForDarwinAMD64(t testing.TB) {
+	if os.Getenv("BUILD_ID") != "" && runtime.GOOS == "darwin" && runtime.GOARCH == "amd64" {
+		t.Skip("Skip test on CI for darwin/amd64")
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ func TestData(t *testing.T) {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`func TestActions(t *testing.T) {`
	`68`	`+ skipOnCIForDarwinAMD64(t)`
	`69`	`+`
`68`	`70`	`defer abtest.SetupDataDir(t)()`
`69`	`71`
`70`	`72`	`bucket, err := datastore.OpenBucket(bucketName)`
`@@ -173,6 +175,8 @@ func TestActions(t *testing.T) {`
`173`	`175`	`}`
`174`	`176`
`175`	`177`	`func TestExcludedFiles(t *testing.T) {`
	`178`	`+ skipOnCIForDarwinAMD64(t)`
	`179`	`+`
`176`	`180`	`defer abtest.SetupDataDir(t)()`
`177`	`181`
`178`	`182`	`bucket, err := datastore.OpenBucket(bucketName)`
`@@ -227,6 +231,8 @@ func TestExcludedFiles(t *testing.T) {`
`227`	`231`	`}`
`228`	`232`
`229`	`233`	`func TestIncludedExcludedFiles(t *testing.T) {`
	`234`	`+ skipOnCIForDarwinAMD64(t)`
	`235`	`+`
`230`	`236`	`defer abtest.SetupDataDir(t)()`
`231`	`237`
`232`	`238`	`bucket, err := datastore.OpenBucket(bucketName)`
`@@ -980,3 +986,9 @@ func getConfig(path ...string) map[string]interface{} {`
`980`	`986`	"exclude_files": []string{`(?i)\.sw[nop]$`, `[/\\]\.git([/\\]\|$)`},
`981`	`987`	`}`
`982`	`988`	`}`
	`989`	`+`
	`990`	`+func skipOnCIForDarwinAMD64(t testing.TB) {`
	`991`	`+ if os.Getenv("BUILD_ID") != "" && runtime.GOOS == "darwin" && runtime.GOARCH == "amd64" {`
	`992`	`+ t.Skip("Skip test on CI for darwin/amd64")`
	`993`	`+ }`
	`994`	`+}`