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

Even more flaky test improvements #2040

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Even more flaky test improvements #2040

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f446949
Check for cmd and process before accessing in test
RebeccaMahany Jan 9, 2025
cf6644c
Maybe()
RebeccaMahany Jan 9, 2025
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
14 changes: 8 additions & 6 deletions pkg/osquery/runtime/runtime_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -553,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))
Expand Down
Loading