From 3a23b80b1120cd3e6aaf21d91784fce81b8054df Mon Sep 17 00:00:00 2001
From: Oleksandr Redko <Oleksandr_Redko@epam.com>
Date: Sat, 7 Oct 2023 22:35:21 +0300
Subject: [PATCH] ci: enable test shuffle; fix tests

---
 .github/workflows/ci.yaml | 4 ++--
 flags_test.go             | 1 +
 viper_test.go             | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 53d66e2fd..a12785463 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -57,11 +57,11 @@ jobs:
           go-version: ${{ matrix.go }}
 
       - name: Test
-        run: go test -race -v -tags '${{ matrix.tags }}' ./...
+        run: go test -race -v -tags '${{ matrix.tags }}' -shuffle=on ./...
         if: runner.os != 'Windows'
 
       - name: Test (without race detector)
-        run: go test -v -tags '${{ matrix.tags }}' ./...
+        run: go test -v -tags '${{ matrix.tags }}' -shuffle=on ./...
         if: runner.os == 'Windows'
 
   lint:
diff --git a/flags_test.go b/flags_test.go
index 0978439cc..18a5403c6 100644
--- a/flags_test.go
+++ b/flags_test.go
@@ -9,6 +9,7 @@ import (
 )
 
 func TestBindFlagValueSet(t *testing.T) {
+	Reset()
 	flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
 
 	testValues := map[string]*string{
diff --git a/viper_test.go b/viper_test.go
index b8274a90b..ca579eb1a 100644
--- a/viper_test.go
+++ b/viper_test.go
@@ -471,6 +471,7 @@ func TestReadInConfig(t *testing.T) {
 }
 
 func TestDefault(t *testing.T) {
+	Reset()
 	SetDefault("age", 45)
 	assert.Equal(t, 45, Get("age"))
 
@@ -485,6 +486,7 @@ func TestDefault(t *testing.T) {
 }
 
 func TestUnmarshaling(t *testing.T) {
+	Reset()
 	SetConfigType("yaml")
 	r := bytes.NewReader(yamlExample)
 
@@ -521,6 +523,8 @@ 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)
@@ -528,6 +532,7 @@ func TestAliases(t *testing.T) {
 }
 
 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")
@@ -870,6 +875,7 @@ func TestRecursiveAliases(t *testing.T) {
 }
 
 func TestUnmarshal(t *testing.T) {
+	Reset()
 	SetDefault("port", 1313)
 	Set("name", "Steve")
 	Set("duration", "1s1ms")
@@ -1341,6 +1347,7 @@ func TestBindPFlagStringToInt(t *testing.T) {
 }
 
 func TestBoundCaseSensitivity(t *testing.T) {
+	initConfigs()
 	assert.Equal(t, "brown", Get("eyes"))
 
 	BindEnv("eYEs", "TURTLE_EYES")