Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added commitID for activation tests that immediately run state pull to update. #2862

Merged
merged 1 commit into from
Nov 2, 2023
+2 −1
Merged

Added commitID for activation tests that immediately run state pull to update. #2862

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion test/integration/activate_int_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ version: %s
`, constants.BranchName, constants.Version))

ts.PrepareActiveStateYAML(content)
ts.PrepareCommitIdFile("59404293-e5a9-4fd0-8843-77cd4761b5b5")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the commit ID file be disabled for v43? Sorry if I'm missing something here...

Copy link
Contributor Author

@mitchell-as mitchell-as Nov 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That function body will have a temporary shim to handle legacy vs. commit ID file. At this time since that PR is not merged yet, we're still using commit ID files.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this change now that the PR is removed?

Copy link
Contributor Author

@mitchell-as mitchell-as Nov 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function ends up modifying the activestate.yaml to the project: org/project#commitId format instead of creating a commit file. Whenever we end up putting localcommits and buildscripts back, that function will go back to writing commit files instead of modifying activestate.yaml.

Either way is transparent to the test and the test should not care what happens behind the scenes.


// Pull to ensure we have an up to date config file
cp := ts.Spawn("pull")
Expand Down Expand Up @@ -453,7 +454,7 @@ func (suite *ActivateIntegrationTestSuite) TestActivate_NamespaceWins() {
suite.Require().NoError(err)

// Create the project file at the root of the temp dir
ts.PrepareProject("ActiveState-CLI/Python3", "")
ts.PrepareProject("ActiveState-CLI/Python3", "59404293-e5a9-4fd0-8843-77cd4761b5b5")

// Pull to ensure we have an up to date config file
cp := ts.Spawn("pull")
Expand Down
Loading