Fix unit test

Signed-off-by: Anuj Chaudhari <[email protected]>
vmware-tanzu · Jan 4, 2025 · 24a6ec1 · 24a6ec1
1 parent 6e8a309
commit 24a6ec1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/pkg/auth/utils/kubeconfig/kubeconfig.go b/pkg/auth/utils/kubeconfig/kubeconfig.go
@@ -37,7 +37,7 @@ func MergeKubeConfigWithoutSwitchContext(kubeConfig []byte, mergeFile string) er
 	}
 
 	context := dest.CurrentContext
-	err = mergo.Merge(dest, newConfig, mergo.WithOverwriteWithEmptyValue)
+	err = mergo.Merge(dest, newConfig)
 
 	if err != nil {
 		return errors.Wrap(err, "failed to merge config")

diff --git a/pkg/command/root_test.go b/pkg/command/root_test.go
@@ -911,6 +911,7 @@ func TestGlobalInit(t *testing.T) {
 				assert.NotContains(string(got), initString)
 				assert.NotContains(string(got), "The initialization encountered an error")
 			}
+			globalinit.ResetInitializers()
 		})
 	}
 }

diff --git a/pkg/globalinit/global_initializers.go b/pkg/globalinit/global_initializers.go
@@ -66,3 +66,7 @@ func PerformInitializations(outStream io.Writer) error {
 
 	return kerrors.NewAggregate(errorList)
 }
+
+func ResetInitializers() {
+	initializers = []initializer{}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -911,6 +911,7 @@ func TestGlobalInit(t *testing.T) { @@
     				assert.NotContains(string(got), initString)
     				assert.NotContains(string(got), "The initialization encountered an error")
     			}
+    			globalinit.ResetInitializers()
     		})
     	}
     }
@@ Expand Down @@