From f446949a58fdafae4c2eccbe2a06a845381191b6 Mon Sep 17 00:00:00 2001 From: RebeccaMahany Date: Thu, 9 Jan 2025 16:21:11 -0500 Subject: [PATCH 1/2] Check for cmd and process before accessing in test --- pkg/osquery/runtime/runtime_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/osquery/runtime/runtime_test.go b/pkg/osquery/runtime/runtime_test.go index f241acfed..b77240958 100644 --- a/pkg/osquery/runtime/runtime_test.go +++ b/pkg/osquery/runtime/runtime_test.go @@ -350,6 +350,8 @@ func waitHealthy(t *testing.T, runner *Runner, logBytes *threadsafebuffer.Thread debugInfo := fmt.Sprintf("instance not healthy by %s: runner logs:\n\n%s", time.Now().String(), logBytes.String()) // Instance is not healthy -- gather info about osquery proc, then fail + require.NotNil(t, runner.instances[types.DefaultRegistrationID].cmd, "cmd not set on instance", debugInfo) + require.NotNil(t, runner.instances[types.DefaultRegistrationID].cmd.Process, "instance cmd does not have process", debugInfo) osqueryProc, err := process.NewProcessWithContext(context.TODO(), int32(runner.instances[types.DefaultRegistrationID].cmd.Process.Pid)) require.NoError(t, err, "getting osquery process info after instance failed to become healthy", debugInfo) From cf6644c7a1597c856adab207c0d88d5fa442fa26 Mon Sep 17 00:00:00 2001 From: RebeccaMahany Date: Thu, 9 Jan 2025 16:22:40 -0500 Subject: [PATCH 2/2] Maybe() --- pkg/osquery/runtime/runtime_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/osquery/runtime/runtime_test.go b/pkg/osquery/runtime/runtime_test.go index b77240958..d4bb4e8bd 100644 --- a/pkg/osquery/runtime/runtime_test.go +++ b/pkg/osquery/runtime/runtime_test.go @@ -555,12 +555,12 @@ func TestMultipleShutdowns(t *testing.T) { k.On("Transport").Return("jsonrpc").Maybe() k.On("ReadEnrollSecret").Return("", nil).Maybe() k.On("InModernStandby").Return(false).Maybe() - k.On("RegisterChangeObserver", mock.Anything, keys.UpdateChannel) - k.On("RegisterChangeObserver", mock.Anything, keys.PinnedLauncherVersion) - k.On("RegisterChangeObserver", mock.Anything, keys.PinnedOsquerydVersion) - k.On("UpdateChannel").Return("stable") - k.On("PinnedLauncherVersion").Return("") - k.On("PinnedOsquerydVersion").Return("") + k.On("RegisterChangeObserver", mock.Anything, keys.UpdateChannel).Maybe() + k.On("RegisterChangeObserver", mock.Anything, keys.PinnedLauncherVersion).Maybe() + k.On("RegisterChangeObserver", mock.Anything, keys.PinnedOsquerydVersion).Maybe() + k.On("UpdateChannel").Return("stable").Maybe() + k.On("PinnedLauncherVersion").Return("").Maybe() + k.On("PinnedOsquerydVersion").Return("").Maybe() setUpMockStores(t, k) runner := New(k, mockServiceClient(t))