Skip to content

Commit 7cea97a

Browse files
authored
Merge pull request #130 from gofiber/codex/2025-07-09-20-23-36
Fix race issues in unit tests
2 parents 88d61c6 + b9d1ce5 commit 7cea97a

File tree

2 files changed

+26
-6
lines changed

2 files changed

+26
-6
lines changed

cmd/helpers_test.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,13 @@ func Test_Helper_LoadConfig(t *testing.T) {
5757
})
5858

5959
t.Run("has config file", func(t *testing.T) {
60-
homeDir = setupHomeDir(t, "LoadConfig")
61-
defer teardownHomeDir(homeDir)
60+
origHome := homeDir
61+
tempHome := setupHomeDir(t, "LoadConfig")
62+
homeDir = tempHome
63+
defer func() {
64+
homeDir = origHome
65+
teardownHomeDir(tempHome)
66+
}()
6267

6368
filename := fmt.Sprintf("%s%c%s", homeDir, os.PathSeparator, configName)
6469

cmd/root_test.go

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,13 @@ func Test_Root_RunE(t *testing.T) {
4343
func Test_Root_RootPersistentPreRun(t *testing.T) {
4444
at, b := setupRootCmd(t)
4545

46-
homeDir = setupHomeDir(t, "RootPersistentPreRun")
47-
defer teardownHomeDir(homeDir)
46+
origHome := homeDir
47+
tempHome := setupHomeDir(t, "RootPersistentPreRun")
48+
homeDir = tempHome
49+
defer func() {
50+
homeDir = origHome
51+
teardownHomeDir(tempHome)
52+
}()
4853

4954
oldFileExist := fileExist
5055
fileExist = func(_ string) bool { return true }
@@ -70,6 +75,9 @@ func Test_Root_RootPersistentPostRun(t *testing.T) {
7075
func Test_Root_CheckCliVersion(t *testing.T) {
7176
at, b := setupRootCmd(t)
7277

78+
rc.CliVersionCheckedAt = 0
79+
upgraded = false
80+
7381
httpmock.Activate()
7482
defer httpmock.DeactivateAndReset()
7583

@@ -79,8 +87,13 @@ func Test_Root_CheckCliVersion(t *testing.T) {
7987

8088
at.Equal(0, b.Len())
8189

82-
homeDir = setupHomeDir(t, "CheckCliVersion")
83-
defer teardownHomeDir(homeDir)
90+
origHome := homeDir
91+
tempHome := setupHomeDir(t, "CheckCliVersion")
92+
homeDir = tempHome
93+
defer func() {
94+
homeDir = origHome
95+
teardownHomeDir(tempHome)
96+
}()
8497

8598
httpmock.RegisterResponder(http.MethodGet, latestCliVersionUrl, httpmock.NewBytesResponder(200, fakeCliVersionResponse()))
8699

@@ -89,10 +102,12 @@ func Test_Root_CheckCliVersion(t *testing.T) {
89102
at.Contains(b.String(), "WARNING")
90103

91104
at.InDelta(time.Now().Unix(), rc.CliVersionCheckedAt, 1)
105+
rc.CliVersionCheckedAt = 0
92106
}
93107

94108
func Test_Root_NeedCheckCliVersion(t *testing.T) {
95109
rc.CliVersionCheckedAt = 0
110+
upgraded = false
96111

97112
assert.True(t, needCheckCliVersion())
98113
}

0 commit comments

Comments
 (0)