Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Fix the fix for tests

Browse Source
This commit is contained in:
Martin Angers
2024-04-08 11:34:31 -04:00
parent f9e1bc2e97
commit f5129bfa1a
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/fleetctl/apply_test.go
+3 -3
View File
@@ -182,7 +182,7 @@ func TestApplyTeamSpecs(t *testing.T) {
return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil
}
ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
declaration.DeclarationUUID = uuid.NewString()
return declaration, nil
}
@@ -589,7 +589,7 @@ func TestApplyAppConfig(t *testing.T) {
return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil
}
ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
declaration.DeclarationUUID = uuid.NewString()
return declaration, nil
}
@@ -1173,7 +1173,7 @@ func TestApplyAsGitOps(t *testing.T) {
require.ElementsMatch(t, labels, []string{fleet.BuiltinMacOS14PlusLabelName})
return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil
}
ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
declaration.DeclarationUUID = uuid.NewString()
return declaration, nil
}
cmd/fleetctl/get_test.go
+1 -1
View File
@@ -2224,7 +2224,7 @@ func TestGetTeamsYAMLAndApply(t *testing.T) {
require.ElementsMatch(t, labels, []string{fleet.BuiltinMacOS14PlusLabelName})
return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil
}
ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
declaration.DeclarationUUID = uuid.NewString()
return declaration, nil
}
cmd/fleetctl/gitops_test.go
+2 -2
View File
@@ -179,7 +179,7 @@ func TestBasicTeamGitOps(t *testing.T) {
require.ElementsMatch(t, labels, []string{fleet.BuiltinMacOS14PlusLabelName})
return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil
}
ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
declaration.DeclarationUUID = uuid.NewString()
return declaration, nil
}
@@ -437,7 +437,7 @@ func TestFullTeamGitOps(t *testing.T) {
require.ElementsMatch(t, labels, []string{fleet.BuiltinMacOS14PlusLabelName})
return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil
}
ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
declaration.DeclarationUUID = uuid.NewString()
return declaration, nil
}
ee/server/service/mdm_external_test.go
+2 -2
View File
@@ -135,7 +135,7 @@ func TestGetOrCreatePreassignTeam(t *testing.T) {
ds.GetMDMAppleSetupAssistantFuncInvoked = false
ds.SetOrUpdateMDMAppleSetupAssistantFuncInvoked = false
ds.LabelIDsByNameFuncInvoked = false
ds.NewMDMAppleDeclarationFuncInvoked = false
ds.SetOrUpdateMDMAppleDeclarationFuncInvoked = false
ds.BulkSetPendingMDMHostProfilesFuncInvoked = false
}
setupDS := func(t *testing.T) {
@@ -192,7 +192,7 @@ func TestGetOrCreatePreassignTeam(t *testing.T) {
require.ElementsMatch(t, names, []string{fleet.BuiltinMacOS14PlusLabelName})
return map[string]uint{names[0]: 1}, nil
}
ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) {
declaration.DeclarationUUID = uuid.NewString()
return declaration, nil
}