diff --git a/daemon/logger/adapter_test.go b/daemon/logger/adapter_test.go index 51fb475b1d..0c8f98c018 100644 --- a/daemon/logger/adapter_test.go +++ b/daemon/logger/adapter_test.go @@ -47,7 +47,6 @@ func (l *mockLoggingPlugin) StartLogging(file string, info Info) error { l.c.Broadcast() return - } l.c.L.Lock() @@ -55,7 +54,6 @@ func (l *mockLoggingPlugin) StartLogging(file string, info Info) error { l.c.L.Unlock() l.c.Broadcast() } - }() return nil } @@ -172,7 +170,6 @@ func TestAdapterReadLogs(t *testing.T) { assert.Check(t, !ok, "expected message channel to be closed") case <-time.After(10 * time.Second): t.Fatal("timeout waiting for message channel to close") - } lw.ConsumerGone() diff --git a/daemon/logger/awslogs/cloudwatchlogs_test.go b/daemon/logger/awslogs/cloudwatchlogs_test.go index 0b87748db1..f28b029452 100644 --- a/daemon/logger/awslogs/cloudwatchlogs_test.go +++ b/daemon/logger/awslogs/cloudwatchlogs_test.go @@ -661,7 +661,6 @@ func TestCollectBatchTicker(t *testing.T) { assert.Equal(t, logline+" 3", aws.StringValue(argument.LogEvents[0].Message)) stream.Close() - } func TestCollectBatchMultilinePattern(t *testing.T) { diff --git a/daemon/logger/loggertest/logreader.go b/daemon/logger/loggertest/logreader.go index 56bfe2ba6a..01f9aff3a3 100644 --- a/daemon/logger/loggertest/logreader.go +++ b/daemon/logger/loggertest/logreader.go @@ -65,7 +65,6 @@ func makeTestMessages() []*logger.Message { {Source: "stderr", Timestamp: time.Now().Add(-1 * 10 * time.Minute), Line: []byte("just one more message")}, {Source: "stdout", Timestamp: time.Now().Add(-1 * 90 * time.Minute), Line: []byte("someone adjusted the clock")}, } - } func (tr Reader) testTail(t *testing.T, live bool) { diff --git a/daemon/logger/loggerutils/sharedtemp.go b/daemon/logger/loggerutils/sharedtemp.go index 8d0ad987da..c3493caabc 100644 --- a/daemon/logger/loggerutils/sharedtemp.go +++ b/daemon/logger/loggerutils/sharedtemp.go @@ -138,7 +138,6 @@ func (c *sharedTempFileConverter) openExisting(st stfcState, id stfID, v sharedT res := <-wait return res.fr, res.err - } func (c *sharedTempFileConverter) convert(f *os.File) (converted *os.File, size int64, err error) { diff --git a/daemon/logger/loggerutils/sharedtemp_test.go b/daemon/logger/loggerutils/sharedtemp_test.go index 8ea0303474..40fbc07a9b 100644 --- a/daemon/logger/loggerutils/sharedtemp_test.go +++ b/daemon/logger/loggerutils/sharedtemp_test.go @@ -207,7 +207,6 @@ func TestSharedTempFileConverter(t *testing.T) { assert.Check(t, src.Close()) assert.NilError(t, os.Remove(name)) checkDirEmpty(t, dir) - }) } diff --git a/daemon/logger/ring_test.go b/daemon/logger/ring_test.go index a2289cc667..eab2446234 100644 --- a/daemon/logger/ring_test.go +++ b/daemon/logger/ring_test.go @@ -142,7 +142,6 @@ func TestRingDrain(t *testing.T) { if len(ls) != 0 { t.Fatalf("expected 0 messages on 2nd drain: %v", ls) } - } type nopLogger struct{} diff --git a/daemon/logger/syslog/syslog.go b/daemon/logger/syslog/syslog.go index 3b58e2249d..cd3463964d 100644 --- a/daemon/logger/syslog/syslog.go +++ b/daemon/logger/syslog/syslog.go @@ -265,5 +265,4 @@ func parseLogFormat(logFormat, proto string) (syslog.Formatter, syslog.Framer, e default: return nil, nil, errors.New("Invalid syslog format") } - }