Merge pull request #14014 from Abirdcfly/master

k8s-ci-robot · web-flow · commit 76f1f448fa41 · 2022-07-21T21:19:38.000-07:00
delete t.FailNow after t.Fatalf
diff --git a/util/pkg/vfs/tests/gsfs_test.go b/util/pkg/vfs/tests/gsfs_test.go
@@ -36,7 +36,6 @@ func TestGSRenderTerraform(t *testing.T) {
 	creds, err := filepath.Abs(credsFile)
 	if err != nil {
 		t.Fatalf("failed to prepare mock gcp credentials: %v", err)
-		t.FailNow()
 	}
 	t.Setenv("GOOGLE_APPLICATION_CREDENTIALS", creds)
 
@@ -80,13 +79,11 @@ func TestGSRenderTerraform(t *testing.T) {
 			path, err := vfs.Context.BuildVfsPath(tc.gsPath)
 			if err != nil {
 				t.Fatalf("error building VFS path: %v", err)
-				t.FailNow()
 			}
 
 			vfsProvider, err := path.(vfs.TerraformPath).TerraformProvider()
 			if err != nil {
 				t.Fatalf("error building VFS Terraform provider: %v", err)
-				t.FailNow()
 			}
 			target := terraform.NewTerraformTarget(cloud, "", vfsProvider, "/dev/null", nil)
 
@@ -103,32 +100,26 @@ func TestGSRenderTerraform(t *testing.T) {
 			)
 			if err != nil {
 				t.Fatalf("error rendering terraform %v", err)
-				t.FailNow()
 			}
 			res, err := target.GetResourcesByType()
 			if err != nil {
 				t.Fatalf("error fetching terraform resources: %v", err)
-				t.FailNow()
 			}
 			if objs := res["google_storage_bucket_object"]; objs == nil {
 				t.Fatalf("google_storage_bucket_object resources not found: %v", res)
-				t.FailNow()
 			}
 			if obj := res["google_storage_bucket_object"][tc.gsObject]; obj == nil {
 				t.Fatalf("google_storage_bucket_object object not found: %v", res["google_storage_bucket_object"])
-				t.FailNow()
 			}
 			obj, err := json.Marshal(res["google_storage_bucket_object"][tc.gsObject])
 			if err != nil {
 				t.Fatalf("error marshaling gs object: %v", err)
-				t.FailNow()
 			}
 			if !assert.JSONEq(t, tc.expectedObjectJSON, string(obj), "JSON representation of terraform resource did not match") {
 				t.FailNow()
 			}
 			if objs := target.TerraformWriter.Files[fmt.Sprintf("data/google_storage_bucket_object_%v_content", tc.gsObject)]; objs == nil {
 				t.Fatalf("google_storage_bucket_object content file not found: %v", target.TerraformWriter.Files)
-				t.FailNow()
 			}
 			actualContent := string(target.TerraformWriter.Files[fmt.Sprintf("data/google_storage_bucket_object_%v_content", tc.gsObject)])
 			if !assert.Equal(t, content, actualContent, "google_storage_bucket_object content did not match") {
@@ -137,16 +128,13 @@ func TestGSRenderTerraform(t *testing.T) {
 
 			if objs := res["google_storage_object_access_control"]; objs == nil {
 				t.Fatalf("google_storage_object_access_control resources not found: %v", res)
-				t.FailNow()
 			}
 			if obj := res["google_storage_object_access_control"][tc.gsObject]; obj == nil {
 				t.Fatalf("google_storage_object_access_control object not found: %v", res["google_storage_object_access_control"])
-				t.FailNow()
 			}
 			actualACL, err := json.Marshal(res["google_storage_object_access_control"][tc.gsObject])
 			if err != nil {
 				t.Fatalf("error marshaling gs ACL: %v", err)
-				t.FailNow()
 			}
 			if !assert.JSONEq(t, tc.expectedACLJSON, string(actualACL), "JSON representation of terraform resource did not match") {
 				t.FailNow()
diff --git a/util/pkg/vfs/tests/s3fs_test.go b/util/pkg/vfs/tests/s3fs_test.go
@@ -61,13 +61,11 @@ func TestS3RenderTerraform(t *testing.T) {
 			path, err := vfs.Context.BuildVfsPath(tc.s3Path)
 			if err != nil {
 				t.Fatalf("error building VFS path: %v", err)
-				t.FailNow()
 			}
 
 			vfsProvider, err := path.(vfs.TerraformPath).TerraformProvider()
 			if err != nil {
 				t.Fatalf("error building VFS Terraform provider: %v", err)
-				t.FailNow()
 			}
 			target := terraform.NewTerraformTarget(cloud, "", vfsProvider, "/dev/null", nil)
 
@@ -76,32 +74,26 @@ func TestS3RenderTerraform(t *testing.T) {
 			)
 			if err != nil {
 				t.Fatalf("error rendering terraform %v", err)
-				t.FailNow()
 			}
 			res, err := target.GetResourcesByType()
 			if err != nil {
 				t.Fatalf("error fetching terraform resources: %v", err)
-				t.FailNow()
 			}
 			if objs := res["aws_s3_object"]; objs == nil {
 				t.Fatalf("aws_s3_object resources not found: %v", res)
-				t.FailNow()
 			}
 			if obj := res["aws_s3_object"][tc.s3Object]; obj == nil {
 				t.Fatalf("aws_s3_object object not found: %v", res["aws_s3_object"])
-				t.FailNow()
 			}
 			obj, err := json.Marshal(res["aws_s3_object"][tc.s3Object])
 			if err != nil {
 				t.Fatalf("error marshaling s3 object: %v", err)
-				t.FailNow()
 			}
 			if !assert.JSONEq(t, tc.expectedJSON, string(obj), "JSON representation of terraform resource did not match") {
 				t.FailNow()
 			}
 			if objs := target.TerraformWriter.Files[fmt.Sprintf("data/aws_s3_object_%v_content", tc.s3Object)]; objs == nil {
 				t.Fatalf("aws_s3_object content file not found: %v", target.TerraformWriter.Files)
-				t.FailNow()
 			}
 			actualContent := string(target.TerraformWriter.Files[fmt.Sprintf("data/aws_s3_object_%v_content", tc.s3Object)])
 			if !assert.Equal(t, content, actualContent, "aws_s3_object content did not match") {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ func TestGSRenderTerraform(t *testing.T) {`
`36`	`36`	`creds, err := filepath.Abs(credsFile)`
`37`	`37`	`if err != nil {`
`38`	`38`	`t.Fatalf("failed to prepare mock gcp credentials: %v", err)`
`39`		`- t.FailNow()`
`40`	`39`	`}`
`41`	`40`	`t.Setenv("GOOGLE_APPLICATION_CREDENTIALS", creds)`
`42`	`41`
`@@ -80,13 +79,11 @@ func TestGSRenderTerraform(t *testing.T) {`
`80`	`79`	`path, err := vfs.Context.BuildVfsPath(tc.gsPath)`
`81`	`80`	`if err != nil {`
`82`	`81`	`t.Fatalf("error building VFS path: %v", err)`
`83`		`- t.FailNow()`
`84`	`82`	`}`
`85`	`83`
`86`	`84`	`vfsProvider, err := path.(vfs.TerraformPath).TerraformProvider()`
`87`	`85`	`if err != nil {`
`88`	`86`	`t.Fatalf("error building VFS Terraform provider: %v", err)`
`89`		`- t.FailNow()`
`90`	`87`	`}`
`91`	`88`	`target := terraform.NewTerraformTarget(cloud, "", vfsProvider, "/dev/null", nil)`
`92`	`89`
`@@ -103,32 +100,26 @@ func TestGSRenderTerraform(t *testing.T) {`
`103`	`100`	`)`
`104`	`101`	`if err != nil {`
`105`	`102`	`t.Fatalf("error rendering terraform %v", err)`
`106`		`- t.FailNow()`
`107`	`103`	`}`
`108`	`104`	`res, err := target.GetResourcesByType()`
`109`	`105`	`if err != nil {`
`110`	`106`	`t.Fatalf("error fetching terraform resources: %v", err)`
`111`		`- t.FailNow()`
`112`	`107`	`}`
`113`	`108`	`if objs := res["google_storage_bucket_object"]; objs == nil {`
`114`	`109`	`t.Fatalf("google_storage_bucket_object resources not found: %v", res)`
`115`		`- t.FailNow()`
`116`	`110`	`}`
`117`	`111`	`if obj := res["google_storage_bucket_object"][tc.gsObject]; obj == nil {`
`118`	`112`	`t.Fatalf("google_storage_bucket_object object not found: %v", res["google_storage_bucket_object"])`
`119`		`- t.FailNow()`
`120`	`113`	`}`
`121`	`114`	`obj, err := json.Marshal(res["google_storage_bucket_object"][tc.gsObject])`
`122`	`115`	`if err != nil {`
`123`	`116`	`t.Fatalf("error marshaling gs object: %v", err)`
`124`		`- t.FailNow()`
`125`	`117`	`}`
`126`	`118`	`if !assert.JSONEq(t, tc.expectedObjectJSON, string(obj), "JSON representation of terraform resource did not match") {`
`127`	`119`	`t.FailNow()`
`128`	`120`	`}`
`129`	`121`	`if objs := target.TerraformWriter.Files[fmt.Sprintf("data/google_storage_bucket_object_%v_content", tc.gsObject)]; objs == nil {`
`130`	`122`	`t.Fatalf("google_storage_bucket_object content file not found: %v", target.TerraformWriter.Files)`
`131`		`- t.FailNow()`
`132`	`123`	`}`
`133`	`124`	`actualContent := string(target.TerraformWriter.Files[fmt.Sprintf("data/google_storage_bucket_object_%v_content", tc.gsObject)])`
`134`	`125`	`if !assert.Equal(t, content, actualContent, "google_storage_bucket_object content did not match") {`
`@@ -137,16 +128,13 @@ func TestGSRenderTerraform(t *testing.T) {`
`137`	`128`
`138`	`129`	`if objs := res["google_storage_object_access_control"]; objs == nil {`
`139`	`130`	`t.Fatalf("google_storage_object_access_control resources not found: %v", res)`
`140`		`- t.FailNow()`
`141`	`131`	`}`
`142`	`132`	`if obj := res["google_storage_object_access_control"][tc.gsObject]; obj == nil {`
`143`	`133`	`t.Fatalf("google_storage_object_access_control object not found: %v", res["google_storage_object_access_control"])`
`144`		`- t.FailNow()`
`145`	`134`	`}`
`146`	`135`	`actualACL, err := json.Marshal(res["google_storage_object_access_control"][tc.gsObject])`
`147`	`136`	`if err != nil {`
`148`	`137`	`t.Fatalf("error marshaling gs ACL: %v", err)`
`149`		`- t.FailNow()`
`150`	`138`	`}`
`151`	`139`	`if !assert.JSONEq(t, tc.expectedACLJSON, string(actualACL), "JSON representation of terraform resource did not match") {`
`152`	`140`	`t.FailNow()`
Original file line number	Diff line number	Diff line change
`@@ -61,13 +61,11 @@ func TestS3RenderTerraform(t *testing.T) {`
`61`	`61`	`path, err := vfs.Context.BuildVfsPath(tc.s3Path)`
`62`	`62`	`if err != nil {`
`63`	`63`	`t.Fatalf("error building VFS path: %v", err)`
`64`		`- t.FailNow()`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`vfsProvider, err := path.(vfs.TerraformPath).TerraformProvider()`
`68`	`67`	`if err != nil {`
`69`	`68`	`t.Fatalf("error building VFS Terraform provider: %v", err)`
`70`		`- t.FailNow()`
`71`	`69`	`}`
`72`	`70`	`target := terraform.NewTerraformTarget(cloud, "", vfsProvider, "/dev/null", nil)`
`73`	`71`
`@@ -76,32 +74,26 @@ func TestS3RenderTerraform(t *testing.T) {`
`76`	`74`	`)`
`77`	`75`	`if err != nil {`
`78`	`76`	`t.Fatalf("error rendering terraform %v", err)`
`79`		`- t.FailNow()`
`80`	`77`	`}`
`81`	`78`	`res, err := target.GetResourcesByType()`
`82`	`79`	`if err != nil {`
`83`	`80`	`t.Fatalf("error fetching terraform resources: %v", err)`
`84`		`- t.FailNow()`
`85`	`81`	`}`
`86`	`82`	`if objs := res["aws_s3_object"]; objs == nil {`
`87`	`83`	`t.Fatalf("aws_s3_object resources not found: %v", res)`
`88`		`- t.FailNow()`
`89`	`84`	`}`
`90`	`85`	`if obj := res["aws_s3_object"][tc.s3Object]; obj == nil {`
`91`	`86`	`t.Fatalf("aws_s3_object object not found: %v", res["aws_s3_object"])`
`92`		`- t.FailNow()`
`93`	`87`	`}`
`94`	`88`	`obj, err := json.Marshal(res["aws_s3_object"][tc.s3Object])`
`95`	`89`	`if err != nil {`
`96`	`90`	`t.Fatalf("error marshaling s3 object: %v", err)`
`97`		`- t.FailNow()`
`98`	`91`	`}`
`99`	`92`	`if !assert.JSONEq(t, tc.expectedJSON, string(obj), "JSON representation of terraform resource did not match") {`
`100`	`93`	`t.FailNow()`
`101`	`94`	`}`
`102`	`95`	`if objs := target.TerraformWriter.Files[fmt.Sprintf("data/aws_s3_object_%v_content", tc.s3Object)]; objs == nil {`
`103`	`96`	`t.Fatalf("aws_s3_object content file not found: %v", target.TerraformWriter.Files)`
`104`		`- t.FailNow()`
`105`	`97`	`}`
`106`	`98`	`actualContent := string(target.TerraformWriter.Files[fmt.Sprintf("data/aws_s3_object_%v_content", tc.s3Object)])`
`107`	`99`	`if !assert.Equal(t, content, actualContent, "aws_s3_object content did not match") {`