Compare log messages time as seconds (#3335)

6.19.x
Yevhenii Voevodin 2016-12-09 12:17:21 +02:00 committed by GitHub
parent 109dfed6e9
commit 030bd567a5
2 changed files with 9 additions and 9 deletions

View File

@ -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 {

View File

@ -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)
}
}