Fix tests

spf13 · Oct 7, 2023 · a7ec99f · a7ec99f
1 parent be7bcca
commit a7ec99f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/flags_test.go b/flags_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestBindFlagValueSet(t *testing.T) {
-	flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
+	flagSet := pflag.NewFlagSet(t.Name(), pflag.ContinueOnError)
 
 	testValues := map[string]*string{
 		"host":     nil,

diff --git a/viper_test.go b/viper_test.go
@@ -472,6 +472,7 @@ func TestReadInConfig(t *testing.T) {
 }
 
 func TestDefault(t *testing.T) {
+	Reset()
 	SetDefault("age", 45)
 	assert.Equal(t, 45, Get("age"))
 
@@ -486,6 +487,7 @@ func TestDefault(t *testing.T) {
 }
 
 func TestUnmarshaling(t *testing.T) {
+	Reset()
 	SetConfigType("yaml")
 	r := bytes.NewReader(yamlExample)
 
@@ -524,13 +526,16 @@ func TestDefaultPost(t *testing.T) {
 }
 
 func TestAliases(t *testing.T) {
+	initConfigs()
+	Set("age", 40)
 	RegisterAlias("years", "age")
 	assert.Equal(t, 40, Get("years"))
 	Set("years", 45)
 	assert.Equal(t, 45, Get("age"))
 }
 
 func TestAliasInConfigFile(t *testing.T) {
+	initConfigs()
 	// the config file specifies "beard".  If we make this an alias for
 	// "hasbeard", we still want the old config file to work with beard.
 	RegisterAlias("beard", "hasbeard")
@@ -873,6 +878,7 @@ func TestRecursiveAliases(t *testing.T) {
 }
 
 func TestUnmarshal(t *testing.T) {
+	Reset()
 	SetDefault("port", 1313)
 	Set("name", "Steve")
 	Set("duration", "1s1ms")
@@ -959,7 +965,7 @@ func TestUnmarshalWithDecoderOptions(t *testing.T) {
 
 func TestBindPFlags(t *testing.T) {
 	v := New() // create independent Viper object
-	flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
+	flagSet := pflag.NewFlagSet(t.Name(), pflag.ContinueOnError)
 
 	testValues := map[string]*string{
 		"host":     nil,
@@ -1009,7 +1015,7 @@ func TestBindPFlagsStringSlice(t *testing.T) {
 	v.SetDefault("stringslice", defaultVal)
 
 	for _, testValue := range tests {
-		flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
+		flagSet := pflag.NewFlagSet(t.Name(), pflag.ContinueOnError)
 		flagSet.StringSlice("stringslice", testValue.Expected, "test")
 
 		for _, changed := range []bool{true, false} {
@@ -1057,7 +1063,7 @@ func TestBindPFlagsStringArray(t *testing.T) {
 	v.SetDefault("stringarray", defaultVal)
 
 	for _, testValue := range tests {
-		flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
+		flagSet := pflag.NewFlagSet(t.Name(), pflag.ContinueOnError)
 		flagSet.StringArray("stringarray", testValue.Expected, "test")
 
 		for _, changed := range []bool{true, false} {
@@ -1089,7 +1095,7 @@ func TestBindPFlagsStringArray(t *testing.T) {
 }
 
 func TestSliceFlagsReturnCorrectType(t *testing.T) {
-	flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
+	flagSet := pflag.NewFlagSet(t.Name(), pflag.ContinueOnError)
 	flagSet.IntSlice("int", []int{1, 2}, "")
 	flagSet.StringSlice("str", []string{"3", "4"}, "")
 	flagSet.DurationSlice("duration", []time.Duration{5 * time.Second}, "")
@@ -1126,7 +1132,7 @@ func TestBindPFlagsIntSlice(t *testing.T) {
 	v.SetDefault("intslice", defaultVal)
 
 	for _, testValue := range tests {
-		flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
+		flagSet := pflag.NewFlagSet(t.Name(), pflag.ContinueOnError)
 		flagSet.IntSlice("intslice", testValue.Expected, "test")
 
 		for _, changed := range []bool{true, false} {
@@ -1199,7 +1205,7 @@ func TestBindPFlagStringToString(t *testing.T) {
 	v.SetDefault("stringtostring", defaultVal)
 
 	for _, testValue := range tests {
-		flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
+		flagSet := pflag.NewFlagSet(t.Name(), pflag.ContinueOnError)
 		flagSet.StringToString("stringtostring", testValue.Expected, "test")
 
 		for _, changed := range []bool{true, false} {
@@ -1246,7 +1252,7 @@ func TestBindPFlagStringToInt(t *testing.T) {
 	v.SetDefault("stringtoint", defaultVal)
 
 	for _, testValue := range tests {
-		flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
+		flagSet := pflag.NewFlagSet(t.Name(), pflag.ContinueOnError)
 		flagSet.StringToInt("stringtoint", testValue.Expected, "test")
 
 		for _, changed := range []bool{true, false} {
@@ -1277,6 +1283,7 @@ func TestBindPFlagStringToInt(t *testing.T) {
 }
 
 func TestBoundCaseSensitivity(t *testing.T) {
+	initConfigs()
 	assert.Equal(t, "brown", Get("eyes"))
 
 	BindEnv("eYEs", "TURTLE_EYES")
@@ -2504,7 +2511,7 @@ func TestWatchFile(t *testing.T) {
 }
 
 func TestUnmarshal_DotSeparatorBackwardCompatibility(t *testing.T) {
-	flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
+	flags := pflag.NewFlagSet(t.Name(), pflag.ContinueOnError)
 	flags.String("foo.bar", "cobra_flag", "")
 
 	v := New()