Skip to content

Update test expectations after changes to fleet-gitops #39261

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

Merged
sgress454 merged 1 commit into from
Feb 3, 2026
Merged

Update test expectations after changes to fleet-gitops #39261

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
9 changes: 3 additions & 6 deletions cmd/fleetctl/integrationtest/gitops/gitops_enterprise_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ team_settings:

// Check that all the teams exist
teamsJSON := fleetctl.RunAppForTest(t, []string{"get", "teams", "--config", fleetctlConfig.Name(), "--json"})
assert.Equal(t, 3, strings.Count(teamsJSON, "team_id"))
assert.Equal(t, 6, strings.Count(teamsJSON, "team_id"))

// Real run with all the files, and delete other teams
args = []string{"gitops", "--config", fleetctlConfig.Name(), "--delete-other-teams", "-f", globalFile}
Expand All @@ -323,7 +323,7 @@ team_settings:

// Check that only the right teams exist
teamsJSON = fleetctl.RunAppForTest(t, []string{"get", "teams", "--config", fleetctlConfig.Name(), "--json"})
assert.Equal(t, 2, strings.Count(teamsJSON, "team_id"))
assert.Equal(t, 5, strings.Count(teamsJSON, "team_id"))
assert.NotContains(t, teamsJSON, deletedTeamName)

// Real run with one file at a time
Expand Down Expand Up @@ -3183,7 +3183,6 @@ org_settings:

for _, testCase := range testCases {
t.Run(testCase.Name, func(t *testing.T) {

globalCfgFile, err := os.CreateTemp(t.TempDir(), "*.yml")
require.NoError(t, err)

Expand Down Expand Up @@ -3221,8 +3220,7 @@ func (s *enterpriseIntegrationGitopsTestSuite) TestSpecialCaseTeamsVPPApps() {

// The global template includes VPP token assignment to the team
// The location "Jungle" comes from test.CreateInsertGlobalVPPToken
globalTemplate :=
`agent_options:
globalTemplate := `agent_options:
controls:
org_settings:
server_settings:
Expand Down Expand Up @@ -3329,5 +3327,4 @@ team_settings:
require.Len(t, titles, 2) // One for iOS, one for iPadOS
})
}

}
Loading