Fix more tests

Author: MDrakos

test/integration/deploy_int_test.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/ActiveState/cli/internal/testhelpers/suite"
 
-	"github.com/ActiveState/cli/internal/config"
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/fileutils"
 	"github.com/ActiveState/cli/internal/subshell"
@@ -207,7 +206,9 @@ func (suite *DeployIntegrationTestSuite) TestDeployPython() {
 	cp.SendLine("exit")
 	cp.ExpectExitCode(0)
 
-	suite.AssertConfig(ts, targetID.String())
+	ts.WithEnv(func() {
+		suite.AssertConfig(ts, targetID.String())
+	})
 }
 
 func (suite *DeployIntegrationTestSuite) TestDeployInstall() {
@@ -294,17 +295,17 @@ func (suite *DeployIntegrationTestSuite) TestDeployConfigure() {
 func (suite *DeployIntegrationTestSuite) AssertConfig(ts *e2e.Session, targetID string) {
 	if runtime.GOOS != "windows" {
 		// Test config file
-		cfg, err := config.New()
-		suite.Require().NoError(err)
 
-		subshell := subshell.New(cfg)
-		rcFile, err := subshell.RcFile()
-		suite.Require().NoError(err)
+		ts.WithEnv(func() {
+			subshell := subshell.New(ts.Config())
+			rcFile, err := subshell.RcFile()
+			suite.Require().NoError(err)
 
-		bashContents := fileutils.ReadFileUnsafe(rcFile)
-		suite.Contains(string(bashContents), constants.RCAppendDeployStartLine, "config file should contain our RC Append Start line")
-		suite.Contains(string(bashContents), constants.RCAppendDeployStopLine, "config file should contain our RC Append Stop line")
-		suite.Contains(string(bashContents), targetID, "config file should contain our target dir")
+			bashContents := fileutils.ReadFileUnsafe(rcFile)
+			suite.Contains(string(bashContents), constants.RCAppendDeployStartLine, "config file should contain our RC Append Start line")
+			suite.Contains(string(bashContents), constants.RCAppendDeployStopLine, "config file should contain our RC Append Stop line")
+			suite.Contains(string(bashContents), targetID, "config file should contain our target dir")
+		})
 	} else {
 		// Test registry
 		out, err := exec.Command("reg", "query", `HKLM\SYSTEM\ControlSet001\Control\Session Manager\Environment`, "/v", "Path").Output()

test/integration/use_int_test.go

@@ -127,13 +127,16 @@ func (suite *UseIntegrationTestSuite) TestReset() {
 	python3Exe := filepath.Join(ts.Dirs.DefaultBin, "python3"+osutils.ExeExtension)
 	suite.True(fileutils.TargetExists(python3Exe), python3Exe+" not found")
 
-	cfg, err := config.New()
-	suite.NoError(err)
-	rcfile, err := subshell.New(cfg).RcFile()
-	if runtime.GOOS != "windows" && fileutils.FileExists(rcfile) {
+	var rcfile string
+	ts.WithEnv(func() {
+		cfg, err := config.New()
 		suite.NoError(err)
-		suite.Contains(string(fileutils.ReadFileUnsafe(rcfile)), ts.Dirs.DefaultBin, "PATH does not have your project in it")
-	}
+		rcfile, err := subshell.New(cfg).RcFile()
+		if runtime.GOOS != "windows" && fileutils.FileExists(rcfile) {
+			suite.NoError(err)
+			suite.Contains(string(fileutils.ReadFileUnsafe(rcfile)), ts.Dirs.DefaultBin, "PATH does not have your project in it")
+		}
+	})
 
 	cp = ts.Spawn("use", "reset")
 	cp.Expect("Continue?")