Fixed wrong var in error messages in tests

Rob Rati · Rob Rati · commit 765f75b836c1 · 2020-12-10T18:15:36.000-05:00
diff --git a/pkg/controller/bucket/bucket_controller_test.go b/pkg/controller/bucket/bucket_controller_test.go
@@ -162,13 +162,13 @@ func TestAddValidProtocols(t *testing.T) {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
 				if in.BucketContext["ServiceAccount"] != account {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["ServiceAccount"])
+					t.Errorf("expected %s, got %s", account, in.BucketContext["ServiceAccount"])
 				}
 				if in.BucketContext["PrivateKeyName"] != keyName {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["PrivateKeyName"])
+					t.Errorf("expected %s, got %s", keyName, in.BucketContext["PrivateKeyName"])
 				}
 				if in.BucketContext["ProjectID"] != projID {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["ProjectID"])
+					t.Errorf("expected %s, got %s", projID, in.BucketContext["ProjectID"])
 				}
 				return &osspec.ProvisionerCreateBucketResponse{}, nil
 			},
@@ -187,7 +187,7 @@ func TestAddValidProtocols(t *testing.T) {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
 				if in.BucketContext["StorageAccount"] != account {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])
+					t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])
 				}
 				return &osspec.ProvisionerCreateBucketResponse{}, nil
 			},
@@ -206,7 +206,7 @@ func TestAddValidProtocols(t *testing.T) {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
 				if in.BucketContext["StorageAccount"] != account {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])
+					t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])
 				}
 				aMode := osspec.ProvisionerCreateBucketRequest_AnonymousBucketAccessMode(osspec.ProvisionerCreateBucketRequest_AnonymousBucketAccessMode_value[anonAccess])
 				if in.AnonymousBucketAccessMode != aMode {
@@ -384,13 +384,13 @@ func TestDeleteValidProtocols(t *testing.T) {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
 				if in.BucketContext["ServiceAccount"] != account {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["ServiceAccount"])
+					t.Errorf("expected %s, got %s", account, in.BucketContext["ServiceAccount"])
 				}
 				if in.BucketContext["PrivateKeyName"] != keyName {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["PrivateKeyName"])
+					t.Errorf("expected %s, got %s", keyName, in.BucketContext["PrivateKeyName"])
 				}
 				if in.BucketContext["ProjectID"] != projID {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["ProjectID"])
+					t.Errorf("expected %s, got %s", projID, in.BucketContext["ProjectID"])
 				}
 				return &osspec.ProvisionerDeleteBucketResponse{}, nil
 			},
@@ -409,7 +409,7 @@ func TestDeleteValidProtocols(t *testing.T) {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
 				if in.BucketContext["StorageAccount"] != account {
-					t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])
+					t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])
 				}
 				return &osspec.ProvisionerDeleteBucketResponse{}, nil
 			},

Original file line number	Diff line number	Diff line change
`@@ -162,13 +162,13 @@ func TestAddValidProtocols(t *testing.T) {`
`162`	`162`	`t.Errorf("expected %s, got %s", bucketName, in.BucketName)`
`163`	`163`	`}`
`164`	`164`	`if in.BucketContext["ServiceAccount"] != account {`
`165`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["ServiceAccount"])`
	`165`	`+ t.Errorf("expected %s, got %s", account, in.BucketContext["ServiceAccount"])`
`166`	`166`	`}`
`167`	`167`	`if in.BucketContext["PrivateKeyName"] != keyName {`
`168`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["PrivateKeyName"])`
	`168`	`+ t.Errorf("expected %s, got %s", keyName, in.BucketContext["PrivateKeyName"])`
`169`	`169`	`}`
`170`	`170`	`if in.BucketContext["ProjectID"] != projID {`
`171`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["ProjectID"])`
	`171`	`+ t.Errorf("expected %s, got %s", projID, in.BucketContext["ProjectID"])`
`172`	`172`	`}`
`173`	`173`	`return &osspec.ProvisionerCreateBucketResponse{}, nil`
`174`	`174`	`},`
`@@ -187,7 +187,7 @@ func TestAddValidProtocols(t *testing.T) {`
`187`	`187`	`t.Errorf("expected %s, got %s", bucketName, in.BucketName)`
`188`	`188`	`}`
`189`	`189`	`if in.BucketContext["StorageAccount"] != account {`
`190`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])`
	`190`	`+ t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])`
`191`	`191`	`}`
`192`	`192`	`return &osspec.ProvisionerCreateBucketResponse{}, nil`
`193`	`193`	`},`
`@@ -206,7 +206,7 @@ func TestAddValidProtocols(t *testing.T) {`
`206`	`206`	`t.Errorf("expected %s, got %s", bucketName, in.BucketName)`
`207`	`207`	`}`
`208`	`208`	`if in.BucketContext["StorageAccount"] != account {`
`209`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])`
	`209`	`+ t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])`
`210`	`210`	`}`
`211`	`211`	`aMode := osspec.ProvisionerCreateBucketRequest_AnonymousBucketAccessMode(osspec.ProvisionerCreateBucketRequest_AnonymousBucketAccessMode_value[anonAccess])`
`212`	`212`	`if in.AnonymousBucketAccessMode != aMode {`
`@@ -384,13 +384,13 @@ func TestDeleteValidProtocols(t *testing.T) {`
`384`	`384`	`t.Errorf("expected %s, got %s", bucketName, in.BucketName)`
`385`	`385`	`}`
`386`	`386`	`if in.BucketContext["ServiceAccount"] != account {`
`387`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["ServiceAccount"])`
	`387`	`+ t.Errorf("expected %s, got %s", account, in.BucketContext["ServiceAccount"])`
`388`	`388`	`}`
`389`	`389`	`if in.BucketContext["PrivateKeyName"] != keyName {`
`390`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["PrivateKeyName"])`
	`390`	`+ t.Errorf("expected %s, got %s", keyName, in.BucketContext["PrivateKeyName"])`
`391`	`391`	`}`
`392`	`392`	`if in.BucketContext["ProjectID"] != projID {`
`393`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["ProjectID"])`
	`393`	`+ t.Errorf("expected %s, got %s", projID, in.BucketContext["ProjectID"])`
`394`	`394`	`}`
`395`	`395`	`return &osspec.ProvisionerDeleteBucketResponse{}, nil`
`396`	`396`	`},`
`@@ -409,7 +409,7 @@ func TestDeleteValidProtocols(t *testing.T) {`
`409`	`409`	`t.Errorf("expected %s, got %s", bucketName, in.BucketName)`
`410`	`410`	`}`
`411`	`411`	`if in.BucketContext["StorageAccount"] != account {`
`412`		`- t.Errorf("expected %s, got %s", region, in.BucketContext["StorageAccount"])`
	`412`	`+ t.Errorf("expected %s, got %s", account, in.BucketContext["StorageAccount"])`
`413`	`413`	`}`
`414`	`414`	`return &osspec.ProvisionerDeleteBucketResponse{}, nil`
`415`	`415`	`},`