From 7b7cb382dc6b4341d4fa142362c27eb0970e9c8c Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Thu, 4 Oct 2018 16:32:14 -0700 Subject: [PATCH] more test fixes --- client/driver/logging/rotator_test.go | 18 +++++++++--------- .../driver/logging/syslog_parser_unix_test.go | 4 ++-- .../driver/logging/syslog_server_unix_test.go | 4 +++- client/testing.go | 1 + 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/client/driver/logging/rotator_test.go b/client/driver/logging/rotator_test.go index d988c6493..8f06cec70 100644 --- a/client/driver/logging/rotator_test.go +++ b/client/driver/logging/rotator_test.go @@ -19,7 +19,7 @@ var ( func TestFileRotator_IncorrectPath(t *testing.T) { t.Parallel() - if _, err := NewFileRotator("/foo", baseFileName, 10, 10, testlog.Logger(t)); err == nil { + if _, err := NewFileRotator("/foo", baseFileName, 10, 10, testlog.HCLogger(t)); err == nil { t.Fatalf("expected error") } } @@ -33,7 +33,7 @@ func TestFileRotator_CreateNewFile(t *testing.T) { } defer os.RemoveAll(path) - _, err = NewFileRotator(path, baseFileName, 10, 10, testlog.Logger(t)) + _, err = NewFileRotator(path, baseFileName, 10, 10, testlog.HCLogger(t)) if err != nil { t.Fatalf("test setup err: %v", err) } @@ -61,7 +61,7 @@ func TestFileRotator_OpenLastFile(t *testing.T) { t.Fatalf("test setup failure: %v", err) } - fr, err := NewFileRotator(path, baseFileName, 10, 10, testlog.Logger(t)) + fr, err := NewFileRotator(path, baseFileName, 10, 10, testlog.HCLogger(t)) if err != nil { t.Fatalf("test setup err: %v", err) } @@ -85,7 +85,7 @@ func TestFileRotator_WriteToCurrentFile(t *testing.T) { t.Fatalf("test setup failure: %v", err) } - fr, err := NewFileRotator(path, baseFileName, 10, 5, testlog.Logger(t)) + fr, err := NewFileRotator(path, baseFileName, 10, 5, testlog.HCLogger(t)) if err != nil { t.Fatalf("test setup err: %v", err) } @@ -118,7 +118,7 @@ func TestFileRotator_RotateFiles(t *testing.T) { } defer os.RemoveAll(path) - fr, err := NewFileRotator(path, baseFileName, 10, 5, testlog.Logger(t)) + fr, err := NewFileRotator(path, baseFileName, 10, 5, testlog.HCLogger(t)) if err != nil { t.Fatalf("test setup err: %v", err) } @@ -177,7 +177,7 @@ func TestFileRotator_RotateFiles_Boundary(t *testing.T) { } defer os.RemoveAll(path) - fr, err := NewFileRotator(path, baseFileName, 10, 5, testlog.Logger(t)) + fr, err := NewFileRotator(path, baseFileName, 10, 5, testlog.HCLogger(t)) if err != nil { t.Fatalf("test setup err: %v", err) } @@ -243,7 +243,7 @@ func TestFileRotator_WriteRemaining(t *testing.T) { t.Fatalf("test setup failure: %v", err) } - fr, err := NewFileRotator(path, baseFileName, 10, 5, testlog.Logger(t)) + fr, err := NewFileRotator(path, baseFileName, 10, 5, testlog.HCLogger(t)) if err != nil { t.Fatalf("test setup err: %v", err) } @@ -316,7 +316,7 @@ func TestFileRotator_PurgeOldFiles(t *testing.T) { } defer os.RemoveAll(path) - fr, err := NewFileRotator(path, baseFileName, 2, 2, testlog.Logger(t)) + fr, err := NewFileRotator(path, baseFileName, 2, 2, testlog.HCLogger(t)) if err != nil { t.Fatalf("test setup err: %v", err) } @@ -366,7 +366,7 @@ func benchmarkRotatorWithInputSize(size int, b *testing.B) { } defer os.RemoveAll(path) - fr, err := NewFileRotator(path, baseFileName, 5, 1024*1024, testlog.Logger(b)) + fr, err := NewFileRotator(path, baseFileName, 5, 1024*1024, testlog.HCLogger(b)) if err != nil { b.Fatalf("test setup err: %v", err) } diff --git a/client/driver/logging/syslog_parser_unix_test.go b/client/driver/logging/syslog_parser_unix_test.go index 38d0b6b8a..ebb337fb1 100644 --- a/client/driver/logging/syslog_parser_unix_test.go +++ b/client/driver/logging/syslog_parser_unix_test.go @@ -13,7 +13,7 @@ import ( func TestLogParser_Priority(t *testing.T) { t.Parallel() line := []byte("<30>2016-02-10T10:16:43-08:00 d-thinkpad docker/e2a1e3ebd3a3[22950]: 1:C 10 Feb 18:16:43.391 # Warning: no config file specified, using the default config. In order to specify a config file use redis-server /path/to/redis.conf") - d := NewDockerLogParser(testlog.Logger(t)) + d := NewDockerLogParser(testlog.HCLogger(t)) p, _, err := d.parsePriority(line) if err != nil { t.Fatalf("got an err: %v", err) @@ -32,7 +32,7 @@ func TestLogParser_Priority(t *testing.T) { func TestLogParser_Priority_UnixFormatter(t *testing.T) { t.Parallel() line := []byte("<30>Feb 6, 10:16:43 docker/e2a1e3ebd3a3[22950]: 1:C 10 Feb 18:16:43.391 # Warning: no config file specified, using the default config. In order to specify a config file use redis-server /path/to/redis.conf") - d := NewDockerLogParser(testlog.Logger(t)) + d := NewDockerLogParser(testlog.HCLogger(t)) p, _, err := d.parsePriority(line) if err != nil { t.Fatalf("got an err: %v", err) diff --git a/client/driver/logging/syslog_server_unix_test.go b/client/driver/logging/syslog_server_unix_test.go index 2540d9100..d71e32ee9 100644 --- a/client/driver/logging/syslog_server_unix_test.go +++ b/client/driver/logging/syslog_server_unix_test.go @@ -7,6 +7,8 @@ import ( "path" "testing" "time" + + "github.com/hashicorp/nomad/helper/testlog" ) func TestSyslogServer_Start_Shutdown(t *testing.T) { @@ -24,7 +26,7 @@ func TestSyslogServer_Start_Shutdown(t *testing.T) { t.Fatalf("Failed to listen unix socket: %v", err) } - s := NewSyslogServer(l, make(chan *SyslogMessage, 2048), nil) + s := NewSyslogServer(l, make(chan *SyslogMessage, 2048), testlog.HCLogger(t)) go s.Start() if s.done { diff --git a/client/testing.go b/client/testing.go index bfeef18e4..35d17b8d9 100644 --- a/client/testing.go +++ b/client/testing.go @@ -23,6 +23,7 @@ func TestClient(t testing.T, cb func(c *config.Config)) *Client { conf.Options[fingerprint.TightenNetworkTimeoutsConfig] = "true" logger := testlog.HCLogger(t) + conf.Logger = logger // Set the plugin loaders conf.PluginLoader = catalog.TestPluginLoader(t)