address more comments

Azure · Nov 5, 2024 · 9636208 · 9636208
1 parent 8f779d9
commit 9636208
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/pkg/utils/cloudconfig/azure/config_test.go b/pkg/utils/cloudconfig/azure/config_test.go
@@ -54,7 +54,7 @@ func TestTrimSpace(t *testing.T) {
 		}
 		config.trimSpace()
 		if diff := cmp.Diff(config, expected); diff != "" {
-			t.Fatalf("trimSpace()mismatch (-want +got):\n%s", diff)
+			t.Errorf("trimSpace() mismatch (-got +want):\n%s", diff)
 		}
 	})
 }
@@ -398,24 +398,26 @@ func TestValidate(t *testing.T) {
 			if got := err == nil; got != test.expectPass {
 				t.Errorf("validate() = got %v, want %v", got, test.expectPass)
 			}
-			if name == "VnetResourceGroup empty" {
+
+			if err == nil {
 				if test.config.VnetResourceGroup != test.config.ResourceGroup {
 					t.Errorf("validate() = got %v, want %v", test.config.VnetResourceGroup, test.config.ResourceGroup)
 				}
-			}
-			rateLimitConfig := test.config.Config
-			if rateLimitConfig.CloudProviderRateLimit {
-				if rateLimitConfig.CloudProviderRateLimitQPS == 0 {
-					t.Errorf("validate() = got %v, want deafult %v", rateLimitConfig.CloudProviderRateLimitQPS, consts.RateLimitQPSDefault)
-				}
-				if test.config.Config.CloudProviderRateLimitBucket == 0 {
-					t.Errorf("validate() = got %v, want default %v", rateLimitConfig.CloudProviderRateLimitBucket, consts.RateLimitBucketDefault)
-				}
-				if test.config.Config.CloudProviderRateLimitQPSWrite == 0 {
-					t.Errorf("validate() = got %v, want default %v", rateLimitConfig.CloudProviderRateLimitQPSWrite, rateLimitConfig.CloudProviderRateLimitQPS)
-				}
-				if test.config.Config.CloudProviderRateLimitBucketWrite == 0 {
-					t.Errorf("validate() = got %v, want default %v", rateLimitConfig.CloudProviderRateLimitBucketWrite, rateLimitConfig.CloudProviderRateLimitBucket)
+
+				rateLimitConfig := test.config.Config
+				if rateLimitConfig.CloudProviderRateLimit {
+					if rateLimitConfig.CloudProviderRateLimitQPS == 0 {
+						t.Errorf("validate() = got %v, want deafult %v", rateLimitConfig.CloudProviderRateLimitQPS, consts.RateLimitQPSDefault)
+					}
+					if test.config.Config.CloudProviderRateLimitBucket == 0 {
+						t.Errorf("validate() = got %v, want default %v", rateLimitConfig.CloudProviderRateLimitBucket, consts.RateLimitBucketDefault)
+					}
+					if test.config.Config.CloudProviderRateLimitQPSWrite == 0 {
+						t.Errorf("validate() = got %v, want default %v", rateLimitConfig.CloudProviderRateLimitQPSWrite, rateLimitConfig.CloudProviderRateLimitQPS)
+					}
+					if test.config.Config.CloudProviderRateLimitBucketWrite == 0 {
+						t.Errorf("validate() = got %v, want default %v", rateLimitConfig.CloudProviderRateLimitBucketWrite, rateLimitConfig.CloudProviderRateLimitBucket)
+					}
 				}
 			}
 		})
@@ -475,10 +477,10 @@ func TestNewCloudConfigFromFile(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			config, err := NewCloudConfigFromFile(test.filePath)
 			if got := err != nil; got != test.expectErr {
-				t.Errorf("Failed to run NewCloudConfigFromFile(%s): got %v, want %v", test.filePath, got, test.expectErr)
+				t.Fatalf("Failed to run NewCloudConfigFromFile(%s): got %v, want %v", test.filePath, got, test.expectErr)
 			}
 			if diff := cmp.Diff(config, test.expectedConfig); diff != "" {
-				t.Errorf("NewCloudConfigFromFile(%s) mismatch (-want +got):\n%s", test.filePath, diff)
+				t.Errorf("NewCloudConfigFromFile(%s) mismatch (-got +want):\n%s", test.filePath, diff)
 			}
 		})
 	}