0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #38477 from yongtang/38407-follow-up

Browse source 
Follow up to PR 38407
This commit is contained in:
Sebastiaan van Stijn 2019-01-03 15:13:24 +01:00 • committed by GitHub
commit e78a3dca21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
daemon/logger/awslogs/cloudwatchlogs_test.go
View file

@ -1498,10 +1498,9 @@ func TestValidateLogOptionsForceFlushIntervalSeconds(t *testing.T) {
err := ValidateLogOpt(cfg)
if tc.shouldErr {
expectedErr := "must specify a positive integer for log opt 'awslogs-force-flush-interval-seconds': " + tc.input
assert.Check(t, err != nil, "Expected an error")
assert.Check(t, is.Equal(err.Error(), expectedErr), "Received invalid error")
assert.Error(t, err, expectedErr)
} else {
assert.Check(t, err == nil, "Unexpected error")
assert.NilError(t, err)
}
})
}
@ -1528,10 +1527,9 @@ func TestValidateLogOptionsMaxBufferedEvents(t *testing.T) {
err := ValidateLogOpt(cfg)
if tc.shouldErr {
expectedErr := "must specify a positive integer for log opt 'awslogs-max-buffered-events': " + tc.input
assert.Check(t, err != nil, "Expected an error")
assert.Check(t, is.Equal(err.Error(), expectedErr), "Received invalid error")
assert.Error(t, err, expectedErr)
} else {
assert.Check(t, err == nil, "Unexpected error")
assert.NilError(t, err)
}
})
}