Skip to content

[filebeat] Skip test case for sequoia #42996

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
marc-gr merged 2 commits into from
Mar 5, 2025
Merged

[filebeat] Skip test case for sequoia #42996

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
270efa7
Skip test case for sequoia
marc-gr Mar 4, 2025
03e5f87
Merge branch 'main' into fix/unifiedlogs_test
marc-gr Mar 5, 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
19 changes: 18 additions & 1 deletion x-pack/filebeat/input/unifiedlogs/input_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func TestInput(t *testing.T) {

testCases := []struct {
name string
skip func(*testing.T) bool
cfg config
timeUntilClose time.Duration
assertFunc func(collect *assert.CollectT, events []beat.Event, cursors []*time.Time)
Expand Down Expand Up @@ -139,6 +140,19 @@ func TestInput(t *testing.T) {
},
{
name: "With end date",
skip: func(t *testing.T) bool {
const sequoiaPrefix = "15."
version, err := exec.Command("sw_vers", "-productVersion").CombinedOutput()
if err != nil {
t.Fatalf("failed to get macOS version: %v", err)
return true
}
if strings.HasPrefix(strings.TrimSpace(string(version)), sequoiaPrefix) {
t.Skip("macOS 15.x does not support the --end flag correctly")
return true
}
return false
},
cfg: config{
ShowConfig: showConfig{
ArchiveFile: archivePath,
Expand All @@ -147,7 +161,7 @@ func TestInput(t *testing.T) {
},
timeUntilClose: time.Second,
expectedLogShowCmd: fmt.Sprintf("/usr/bin/log show --style ndjson --archive %s --end 2024-12-04 13:46:00+0200", archivePath),
assertFunc: eventsAndCursorAssertN(462),
assertFunc: eventsAndCursorAssertN(149),
},
{
name: "With predicate",
Expand Down Expand Up @@ -204,6 +218,9 @@ func TestInput(t *testing.T) {
for _, tc := range testCases {
tc := tc
t.Run(tc.name, func(t *testing.T) {
if tc.skip != nil && tc.skip(t) {
return
}
_, cursorInput := newCursorInput(tc.cfg)
input := cursorInput.(*input)

Expand Down
Loading