From 030bd567a5cb4e8528238af57db8085e18d04854 Mon Sep 17 00:00:00 2001 From: Yevhenii Voevodin Date: Fri, 9 Dec 2016 12:17:21 +0200 Subject: [PATCH] Compare log messages time as seconds (#3335) --- exec-agent/src/process/file_logger_test.go | 8 ++------ exec-agent/src/process/logs_reader_test.go | 10 +++++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/exec-agent/src/process/file_logger_test.go b/exec-agent/src/process/file_logger_test.go index 0970a60d16..5db830e314 100644 --- a/exec-agent/src/process/file_logger_test.go +++ b/exec-agent/src/process/file_logger_test.go @@ -102,17 +102,13 @@ func TestLogsAreFlushedOnClose(t *testing.T) { Time: now, Text: "stdout", } - if stdout != expectedStdout { - t.Fatalf("Expected %v but found %v", expectedStdout, stdout) - } expectedStderr := process.LogMessage{ Kind: process.StderrKind, Time: now, Text: "stderr", } - if stdout != expectedStdout { - t.Fatalf("Expected %v but found %v", expectedStderr, stderr) - } + failIfDifferent(t, expectedStdout, stdout) + failIfDifferent(t, expectedStderr, stderr) } func randomName(length int) string { diff --git a/exec-agent/src/process/logs_reader_test.go b/exec-agent/src/process/logs_reader_test.go index 1ee7cb4ca9..41d4b8c5ba 100644 --- a/exec-agent/src/process/logs_reader_test.go +++ b/exec-agent/src/process/logs_reader_test.go @@ -53,8 +53,12 @@ func TestReadLogs(t *testing.T) { {Kind: process.StderrKind, Time: now.Add(time.Second * 4), Text: "line4"}, } for i := 0; i < len(logs); i++ { - if *logs[i] != expected[i] { - t.Fatalf("Expected: '%v' Found '%v'", expected[i], *logs[i]) - } + failIfDifferent(t, *logs[i], expected[i]) + } +} + +func failIfDifferent(t *testing.T, expected process.LogMessage, actual process.LogMessage) { + if expected.Kind != actual.Kind || expected.Text != actual.Text || expected.Time.Unix() != actual.Time.Unix() { + t.Fatalf("Expected: '%v' Found '%v'", expected, actual) } }