finish converting test_template

libbeat/magefile.go

@@ -75,7 +75,7 @@ func IntegTest() {
 
 // GoIntegTest starts the docker containers and executes the Go integration tests.
 func GoIntegTest(ctx context.Context) error {
-	mg.Deps(Fields)
+	mg.Deps(Fields, devtools.BuildSystemTestBinary)
 	args := devtools.DefaultGoTestIntegrationFromHostArgs()
 	// ES_USER must be admin in order for the Go Integration tests to function because they require
 	// indices:data/read/search

libbeat/tests/integration/base_test.go

@@ -197,7 +197,6 @@ output.console:
 	mockbeat.WriteConfigFile(cfg)
 	mockbeat.Start()
 	mockbeat.WaitStdErrContains("mockbeat start running.", 10*time.Second)
-	// mockbeat.WaitForLogs("Home path", 60*time.Second, "error waiting for mockbeat to start")
 
 	metaFile1, err := mockbeat.LoadMeta()
 	require.NoError(t, err, "error opening meta.json file")

libbeat/tests/integration/framework.go

@@ -214,7 +214,7 @@ func (b *BeatProc) Stop() {
 // LogContains looks for `s` as a substring of every log line,
 // it will open the log file on every call, read it until EOF,
 // then close it.
-func (b *BeatProc) LogContains(s string) string {
+func (b *BeatProc) LogContains(s string) bool {
 	t := b.t
 	logFile := b.openLogFile()
 	_, err := logFile.Seek(b.logFileOffset, os.SEEK_SET)
@@ -244,25 +244,20 @@ func (b *BeatProc) LogContains(s string) string {
 		}
 
 		if strings.Contains(line, s) {
-			return line
+			return true
 		}
 	}
 
-	return ""
+	return false
 }
 
 // WaitForLogs waits for the specified string s to be present in the logs within
 // the given timeout duration and fails the test if s is not found.
-func (b *BeatProc) WaitForLogs(s string, timeout time.Duration) string {
+func (b *BeatProc) WaitForLogs(s string, timeout time.Duration, msgAndArgs ...any) {
 	b.t.Helper()
-	errMsg := fmt.Sprintf("Error waiting for log %s", s)
-	var returnValue string
 	require.Eventually(b.t, func() bool {
-		returnValue = b.LogContains(s)
-		return returnValue != ""
-	}, timeout, 100*time.Millisecond, errMsg)
-
-	return returnValue
+		return b.LogContains(s)
+	}, timeout, 100*time.Millisecond, msgAndArgs...)
 }
 
 // TempDir returns the temporary directory