Skip to content

Commit 18906c3

Browse files
[9.1] (backport #10717) Make all beats receiver integration tests use standard tools (#10720)
* Make all beats receiver integration tests use standard tools (#10717) This way, the tests generate diagnostics and ensure agent is not running after test failure. (cherry picked from commit 020adf8) # Conflicts: # testing/integration/ess/beat_receivers_test.go * Resolve conflicts --------- Co-authored-by: Mikołaj Świątek <[email protected]>
1 parent 0e5e2cc commit 18906c3

File tree

1 file changed

+8
-33
lines changed

1 file changed

+8
-33
lines changed

testing/integration/ess/beat_receivers_test.go

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"fmt"
1414
"io"
1515
"net/http"
16-
"os/exec"
1716
"runtime"
1817
"strings"
1918
"testing"
@@ -515,17 +514,17 @@ outputs:
515514
ctx, cancel := testcontext.WithDeadline(t, t.Context(), time.Now().Add(5*time.Minute))
516515
defer cancel()
517516

518-
fixture, cmd, output := prepareAgentCmd(t, ctx, configContents)
517+
// set up a standalone agent
518+
fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
519+
require.NoError(t, err)
519520

520-
err = cmd.Start()
521+
err = fixture.Prepare(ctx)
522+
require.NoError(t, err)
523+
err = fixture.Configure(ctx, configContents)
521524
require.NoError(t, err)
522525

523-
t.Cleanup(func() {
524-
if t.Failed() {
525-
t.Log("Elastic-Agent output:")
526-
t.Log(output.String())
527-
}
528-
})
526+
output, err := fixture.Install(ctx, &atesting.InstallOpts{Privileged: true, Force: true})
527+
require.NoError(t, err, "failed to install agent: %s", output)
529528

530529
require.Eventually(t, func() bool {
531530
err = fixture.IsHealthy(ctx)
@@ -570,9 +569,6 @@ outputs:
570569
30*time.Second, 1*time.Second,
571570
"Expected to find at least one document for metricset %s in index %s and runtime %q, got 0", mset, index, tt.runtimeExperimental)
572571
}
573-
574-
cancel()
575-
cmd.Wait()
576572
})
577573
}
578574

@@ -876,27 +872,6 @@ func getBeatStartLogRecords(logs string) []map[string]any {
876872
return logRecords
877873
}
878874

879-
func prepareAgentCmd(t *testing.T, ctx context.Context, config []byte) (*atesting.Fixture, *exec.Cmd, *strings.Builder) {
880-
// set up a standalone agent
881-
fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
882-
require.NoError(t, err)
883-
884-
err = fixture.Prepare(ctx)
885-
require.NoError(t, err)
886-
err = fixture.Configure(ctx, config)
887-
require.NoError(t, err)
888-
889-
cmd, err := fixture.PrepareAgentCommand(ctx, nil)
890-
require.NoError(t, err)
891-
cmd.WaitDelay = 1 * time.Second
892-
893-
var output strings.Builder
894-
cmd.Stderr = &output
895-
cmd.Stdout = &output
896-
897-
return fixture, cmd, &output
898-
}
899-
900875
func genIgnoredFields(goos string) []string {
901876
switch goos {
902877
case "windows":

0 commit comments

Comments
 (0)