Skip to content

Commit cc65fda

Browse files
committed
Fix --runtime-path usage in checkout e2e test
1 parent c44d4d6 commit cc65fda

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

test/integration/checkout_int_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,26 +149,26 @@ func (suite *CheckoutIntegrationTestSuite) TestCheckoutWithFlags() {
149149
cp.ExpectExitCode(1)
150150
}
151151

152-
func (suite *CheckoutIntegrationTestSuite) TestCheckoutCustomCache() {
152+
func (suite *CheckoutIntegrationTestSuite) TestCheckoutCustomRTPath() {
153153
suite.OnlyRunForTags(tagsuite.Checkout)
154154

155155
ts := e2e.New(suite.T(), true)
156156
defer ts.Close()
157157

158-
customCache, err := fileutils.ResolveUniquePath(filepath.Join(ts.Dirs.Work, "custom-cache"))
158+
customRTPath, err := fileutils.ResolveUniquePath(filepath.Join(ts.Dirs.Work, "custom-cache"))
159159
suite.Require().NoError(err)
160-
err = fileutils.Mkdir(customCache)
160+
err = fileutils.Mkdir(customRTPath)
161161
suite.Require().NoError(err)
162162

163163
// Checkout and verify.
164164
cp := ts.SpawnWithOpts(
165-
e2e.WithArgs("checkout", "ActiveState-CLI/Python3", fmt.Sprintf("--set-cache=%s", customCache)),
165+
e2e.WithArgs("checkout", "ActiveState-CLI/Python3", fmt.Sprintf("--runtime-path=%s", customRTPath)),
166166
e2e.AppendEnv("ACTIVESTATE_CLI_DISABLE_RUNTIME=false"),
167167
)
168168
cp.Expect("Checked out project")
169169

170-
pythonExe := filepath.Join(setup.ExecDir(customCache), "python3"+exeutils.Extension)
171-
suite.Require().True(fileutils.DirExists(customCache))
170+
pythonExe := filepath.Join(setup.ExecDir(customRTPath), "python3"+exeutils.Extension)
171+
suite.Require().True(fileutils.DirExists(customRTPath))
172172
suite.Require().True(fileutils.FileExists(pythonExe))
173173

174174
// Verify runtime was installed correctly and works.
@@ -183,11 +183,11 @@ func (suite *CheckoutIntegrationTestSuite) TestCheckoutCustomCache() {
183183
e2e.WithWorkDirectory(filepath.Join(ts.Dirs.Work, "Python3")),
184184
)
185185
if runtime.GOOS == "windows" {
186-
customCache, err = fileutils.GetLongPathName(customCache)
186+
customRTPath, err = fileutils.GetLongPathName(customRTPath)
187187
suite.Require().NoError(err)
188-
customCache = strings.ToLower(customCache)
188+
customRTPath = strings.ToLower(customRTPath)
189189
}
190-
cp.Expect(customCache)
190+
cp.Expect(customRTPath)
191191
}
192192

193193
func TestCheckoutIntegrationTestSuite(t *testing.T) {

0 commit comments

Comments
 (0)