Skip to content

Commit 89486a8

Browse files
committed
fixing mocks
1 parent b986033 commit 89486a8

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

server/service/mdm_test.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2877,9 +2877,13 @@ func TestProcessIncomingMDMCmdsWipeFailedActivity(t *testing.T) {
28772877
testHostUUID := "test-host-uuid"
28782878
testHostID := uint(42)
28792879
testDeviceID := "test-device-id"
2880+
enrolledDevice := &fleet.MDMWindowsEnrolledDevice{
2881+
MDMDeviceID: testDeviceID,
2882+
HostUUID: testHostUUID,
2883+
}
28802884

28812885
// MDMWindowsSaveResponse returns a WipeFailed result.
2882-
ds.MDMWindowsSaveResponseFunc = func(ctx context.Context, deviceID string, enrichedSyncML fleet.EnrichedSyncML, commandIDsBeingResent []string) (*fleet.MDMWindowsSaveResponseResult, error) {
2886+
ds.MDMWindowsSaveResponseFunc = func(ctx context.Context, _ *fleet.MDMWindowsEnrolledDevice, enrichedSyncML fleet.EnrichedSyncML, commandIDsBeingResent []string) (*fleet.MDMWindowsSaveResponseResult, error) {
28832887
return &fleet.MDMWindowsSaveResponseResult{
28842888
WipeFailed: &fleet.MDMWindowsWipeResult{
28852889
HostUUID: testHostUUID,
@@ -2938,7 +2942,7 @@ func TestProcessIncomingMDMCmdsWipeFailedActivity(t *testing.T) {
29382942
require.NoError(t, xml.Unmarshal([]byte(rawSyncML), reqMsg))
29392943
reqMsg.Raw = []byte(rawSyncML)
29402944

2941-
_, err := svcImpl.processIncomingMDMCmds(ctx, testDeviceID, reqMsg, RequestAuthStateTrusted)
2945+
_, err := svcImpl.processIncomingMDMCmds(ctx, enrolledDevice, reqMsg, RequestAuthStateTrusted)
29422946
require.NoError(t, err)
29432947

29442948
// Verify the activity was created.
@@ -2950,18 +2954,18 @@ func TestProcessIncomingMDMCmdsWipeFailedActivity(t *testing.T) {
29502954
assert.True(t, opts.ActivityMock.NewActivityFuncInvoked)
29512955

29522956
t.Run("no activity when WipeFailed is nil", func(t *testing.T) {
2953-
ds.MDMWindowsSaveResponseFunc = func(ctx context.Context, deviceID string, enrichedSyncML fleet.EnrichedSyncML, commandIDsBeingResent []string) (*fleet.MDMWindowsSaveResponseResult, error) {
2957+
ds.MDMWindowsSaveResponseFunc = func(ctx context.Context, _ *fleet.MDMWindowsEnrolledDevice, enrichedSyncML fleet.EnrichedSyncML, commandIDsBeingResent []string) (*fleet.MDMWindowsSaveResponseResult, error) {
29542958
return nil, nil
29552959
}
29562960
opts.ActivityMock.NewActivityFuncInvoked = false
29572961

2958-
_, err := svcImpl.processIncomingMDMCmds(ctx, testDeviceID, reqMsg, RequestAuthStateTrusted)
2962+
_, err := svcImpl.processIncomingMDMCmds(ctx, enrolledDevice, reqMsg, RequestAuthStateTrusted)
29592963
require.NoError(t, err)
29602964
assert.False(t, opts.ActivityMock.NewActivityFuncInvoked)
29612965
})
29622966

29632967
t.Run("activity skipped when host lookup fails", func(t *testing.T) {
2964-
ds.MDMWindowsSaveResponseFunc = func(ctx context.Context, deviceID string, enrichedSyncML fleet.EnrichedSyncML, commandIDsBeingResent []string) (*fleet.MDMWindowsSaveResponseResult, error) {
2968+
ds.MDMWindowsSaveResponseFunc = func(ctx context.Context, _ *fleet.MDMWindowsEnrolledDevice, enrichedSyncML fleet.EnrichedSyncML, commandIDsBeingResent []string) (*fleet.MDMWindowsSaveResponseResult, error) {
29652969
return &fleet.MDMWindowsSaveResponseResult{
29662970
WipeFailed: &fleet.MDMWindowsWipeResult{
29672971
HostUUID: testHostUUID,
@@ -2973,7 +2977,7 @@ func TestProcessIncomingMDMCmdsWipeFailedActivity(t *testing.T) {
29732977
}
29742978
opts.ActivityMock.NewActivityFuncInvoked = false
29752979

2976-
_, err := svcImpl.processIncomingMDMCmds(ctx, testDeviceID, reqMsg, RequestAuthStateTrusted)
2980+
_, err := svcImpl.processIncomingMDMCmds(ctx, enrolledDevice, reqMsg, RequestAuthStateTrusted)
29772981
require.NoError(t, err)
29782982
// Activity should NOT be created since host lookup failed.
29792983
assert.False(t, opts.ActivityMock.NewActivityFuncInvoked)

0 commit comments

Comments
 (0)