Skip to content

Commit 3fe8ae6

Browse files
committed
Fix test isolation: reset loadedEnv before each LoadEnv() call
loadedEnv is a package-level atomic.Bool that acts as a once-guard. Tests run in the same process, so the first test to call LoadEnv() sets it true, making all subsequent LoadEnv() calls no-ops. This caused TestLoadEnv_FromConnectorsSubdir and TestLoadEnv_RunFromFlowDirectly to always see empty strings instead of their expected env var values. Reset the flag before each test's LoadEnv() call to ensure proper per-test isolation.
1 parent 4c545a0 commit 3fe8ae6

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

flow/internal/testutil/env_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ func TestLoadEnv_FindsEnvAboveFlow(t *testing.T) {
2323
t.Chdir(e2eDir)
2424

2525
os.Unsetenv("TEST_LOAD_ENV")
26+
loadedEnv.Store(false)
2627
LoadEnv()
2728

2829
require.Equal(t, "found_above_flow", os.Getenv("TEST_LOAD_ENV"))
@@ -42,6 +43,7 @@ func TestLoadEnv_IgnoresEnvNotAboveFlow(t *testing.T) {
4243
t.Chdir(subDir)
4344

4445
os.Unsetenv("TEST_LOAD_ENV_IGNORE")
46+
loadedEnv.Store(false)
4547
LoadEnv()
4648

4749
require.Empty(t, os.Getenv("TEST_LOAD_ENV_IGNORE"))
@@ -57,6 +59,7 @@ func TestLoadEnv_NoEnvFile(t *testing.T) {
5759
t.Chdir(e2eDir)
5860

5961
os.Unsetenv("TEST_LOAD_ENV_NONE")
62+
loadedEnv.Store(false)
6063
LoadEnv()
6164

6265
require.Empty(t, os.Getenv("TEST_LOAD_ENV_NONE"))
@@ -77,6 +80,7 @@ func TestLoadEnv_EnvInsideFlowIgnored(t *testing.T) {
7780
t.Chdir(e2eDir)
7881

7982
os.Unsetenv("TEST_LOAD_ENV_INSIDE")
83+
loadedEnv.Store(false)
8084
LoadEnv()
8185

8286
require.Empty(t, os.Getenv("TEST_LOAD_ENV_INSIDE"))
@@ -96,6 +100,7 @@ func TestLoadEnv_FromConnectorsSubdir(t *testing.T) {
96100
t.Chdir(connectorsDir)
97101

98102
os.Unsetenv("TEST_LOAD_ENV_CONNECTORS")
103+
loadedEnv.Store(false)
99104
LoadEnv()
100105

101106
require.Equal(t, "from_connectors", os.Getenv("TEST_LOAD_ENV_CONNECTORS"))
@@ -115,6 +120,7 @@ func TestLoadEnv_RunFromFlowDirectly(t *testing.T) {
115120
t.Chdir(flowDir)
116121

117122
os.Unsetenv("TEST_LOAD_ENV_FROM_FLOW")
123+
loadedEnv.Store(false)
118124
LoadEnv()
119125

120126
require.Equal(t, "from_flow", os.Getenv("TEST_LOAD_ENV_FROM_FLOW"))

0 commit comments

Comments
 (0)