agdcslog: imp tests

Author: schzhn

internal/agdcslog/agdcslog_test.go

@@ -21,6 +21,7 @@ import (
 // testTimeout is the common timeout for tests.
 const testTimeout = 1 * time.Second
 
+// testServiceName is the service name for integration tests.
 const testServiceName = "AdGuardDNSClientTest"
 
 // requireIntegration skips the test unless TEST_AGDCSLOG parses to true.
@@ -29,14 +30,15 @@ func requireIntegration(tb testing.TB) {
 
 	const envName = "TEST_AGDCSLOG"
 
-	val := os.Getenv(envName)
-	if val == "" {
-		tb.Skip("skipping: env is not set")
-	}
-
-	ok, err := strconv.ParseBool(val)
-	if err != nil || !ok {
-		tb.Skip("skipping: unexpected value")
+	switch v := os.Getenv(envName); v {
+	case "":
+		tb.Skipf("skipping: %s is not set", envName)
+	case "0":
+		tb.Skip("skipping: integration tests are disabled")
+	case "1":
+		// Go on.
+	default:
+		tb.Skipf(`skipping: %s must be "1" or "0", got %q`, envName, v)
 	}
 }
 
@@ -74,19 +76,16 @@ func TestSystemLogger_integration(t *testing.T) {
 
 	l := integrationSystemLogger(t)
 
-	since := time.Now()
-	sinceStr := since.Format(time.DateTime)
-
-	msg := strconv.FormatInt(since.UnixNano(), 10)
+	msg := strconv.FormatInt(time.Now().UnixNano(), 10)
 
 	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	l.DebugContext(ctx, msg)
+	l.InfoContext(ctx, msg)
 
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {
 		findCtx, cancel := context.WithTimeout(ctx, testTimeout)
 		defer cancel()
 
-		ok, err := findInLog(findCtx, sinceStr, msg)
+		ok, err := findInLog(findCtx, msg)
 		require.NoError(ct, err)
 
 		assert.True(ct, ok)

internal/agdcslog/syslog_darwin_test.go

@@ -15,12 +15,12 @@ import (
 const cmdLogReader = "log"
 
 // findInLog searches the macOS unified log for the message.
-func findInLog(ctx context.Context, since, msg string) (ok bool, err error) {
+func findInLog(ctx context.Context, msg string) (ok bool, err error) {
 	var stdOut, stdErr bytes.Buffer
 
 	err = executil.Run(ctx, executil.SystemCommandConstructor{}, &executil.CommandConfig{
 		Path:   cmdLogReader,
-		Args:   []string{"show", "--style", "syslog", "--start", since, "--debug"},
+		Args:   []string{"show", "--style", "syslog", "--last", testTimeout.String(), "--info"},
 		Stdout: &stdOut,
 		Stderr: &stdErr,
 	})

internal/agdcslog/syslog_linux_test.go

@@ -15,9 +15,11 @@ import (
 const cmdLogReader = "journalctl"
 
 // findInLog searches the systemd journal for the message.
-func findInLog(ctx context.Context, since, msg string) (ok bool, err error) {
+func findInLog(ctx context.Context, msg string) (ok bool, err error) {
 	var stdOut, stdErr bytes.Buffer
 
+	since := "-" + testTimeout.String()
+
 	err = executil.Run(ctx, executil.SystemCommandConstructor{}, &executil.CommandConfig{
 		Path:   cmdLogReader,
 		Args:   []string{"-o", "cat", "-t", testServiceName, "--since", since, "--no-pager"},

internal/agdcslog/syslog_windows_test.go

@@ -6,7 +6,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/AdguardTeam/golibs/osutil/executil"
 )
@@ -15,21 +14,25 @@ import (
 const cmdLogReader = "wevtutil"
 
 // findInLog searches the Windows Application event log for the message.
-func findInLog(ctx context.Context, _, msg string) (ok bool, err error) {
+func findInLog(ctx context.Context, msg string) (ok bool, err error) {
 	var stdOut, stdErr bytes.Buffer
 
 	ms := testTimeout.Milliseconds()
 	query := fmt.Sprintf(`*[System[TimeCreated[timediff(@SystemTime) <= %d]]]`, ms)
 
 	err = executil.Run(ctx, executil.SystemCommandConstructor{}, &executil.CommandConfig{
 		Path:   cmdLogReader,
-		Args:   []string{"qe", "Application", "/rd:true", "/f:text", "/q:" + query},
+		Args:   []string{"qe", "Application", "/rd:true", "/f:text", "/uni", "/q:" + query},
 		Stdout: &stdOut,
 		Stderr: &stdErr,
 	})
 	if err != nil {
 		return false, fmt.Errorf("log search failed: %w; stderr=%q", err, &stdErr)
 	}
 
-	return strings.Contains(stdOut.String(), msg), nil
+	// Strip NUL bytes from UTF-16LE output.
+	out := stdOut.Bytes()
+	out = bytes.ReplaceAll(out, []byte{0x00}, nil)
+
+	return bytes.Contains(out, []byte(msg)), nil
 }