#4911: fixed environment integration test of tests, needed to shutdow…

…n test during test
stellar · Jul 18, 2024 · 38f2b6d · 38f2b6d
1 parent 1642a1a
commit 38f2b6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/services/horizon/internal/integration/parameters_test.go b/services/horizon/internal/integration/parameters_test.go
@@ -113,6 +113,8 @@ func TestEnvironmentPreserved(t *testing.T) {
 	envValue := os.Getenv("STELLAR_CORE_URL")
 	assert.Equal(t, StellarCoreURL, envValue)
 
+	test.Shutdown()
+
 	envValue = os.Getenv("STELLAR_CORE_URL")
 	assert.Equal(t, "original value", envValue)
 }

diff --git a/services/horizon/internal/test/integration/integration.go b/services/horizon/internal/test/integration/integration.go
@@ -359,10 +359,6 @@ func (i *Test) StartHorizon(startIngestProcess bool) error {
 	})
 	var err error
 
-	if err = i.initializeEnvironmentVariables(); err != nil {
-		return err
-	}
-
 	// To facilitate custom runs of Horizon, we merge a default set of
 	// parameters with the tester-supplied ones (if any).
 	mergedWebArgs := MergeMaps(i.getDefaultWebArgs(), i.config.HorizonWebParameters)
@@ -374,6 +370,10 @@ func (i *Test) StartHorizon(startIngestProcess bool) error {
 		return err
 	}
 
+	if err = i.initializeEnvironmentVariables(); err != nil {
+		return err
+	}
+
 	// setup Horizon web process
 	webArgs := mapToFlags(mergedWebArgs)
 	i.t.Log("Horizon command line webArgs:", webArgs)