From d61fa3825863b4c14bbaf0ea07dee8a7becfa801 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Wed, 13 Sep 2017 08:44:48 -0500 Subject: [PATCH] testing: de-globalize discard loggers --- context_test.go | 18 +++++++++--------- internal/gps/result_test.go | 11 +++++++---- test_project_context_test.go | 4 ++-- txn_writer_test.go | 28 ++++++++++++++-------------- 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/context_test.go b/context_test.go index 503ed1beaf..c08d1e658d 100644 --- a/context_test.go +++ b/context_test.go @@ -17,9 +17,9 @@ import ( "github.com/golang/dep/internal/test" ) -var ( - discardLogger = log.New(ioutil.Discard, "", 0) -) +func discardLogger() *log.Logger { + return log.New(ioutil.Discard, "", 0) +} func TestCtx_ProjectImport(t *testing.T) { h := test.NewHelper(t) @@ -127,8 +127,8 @@ func TestLoadProject(t *testing.T) { for _, tc := range testcases { t.Run(tc.name, func(t *testing.T) { ctx := &Ctx{ - Out: discardLogger, - Err: discardLogger, + Out: discardLogger(), + Err: discardLogger(), } err := ctx.SetPaths(h.Path(tc.wd), h.Path(".")) @@ -200,8 +200,8 @@ func TestLoadProjectManifestParseError(t *testing.T) { ctx := &Ctx{ GOPATH: tg.Path("."), WorkingDir: wd, - Out: discardLogger, - Err: discardLogger, + Out: discardLogger(), + Err: discardLogger(), } _, err = ctx.LoadProject() @@ -231,8 +231,8 @@ func TestLoadProjectLockParseError(t *testing.T) { ctx := &Ctx{ GOPATH: tg.Path("."), WorkingDir: wd, - Out: discardLogger, - Err: discardLogger, + Out: discardLogger(), + Err: discardLogger(), } _, err = ctx.LoadProject() diff --git a/internal/gps/result_test.go b/internal/gps/result_test.go index a01859e6e5..d044f12ad3 100644 --- a/internal/gps/result_test.go +++ b/internal/gps/result_test.go @@ -15,7 +15,9 @@ import ( "github.com/golang/dep/internal/test" ) -var discardLogger = log.New(ioutil.Discard, "", 0) +func discardLogger() *log.Logger { + return log.New(ioutil.Discard, "", 0) +} var basicResult solution @@ -95,12 +97,12 @@ func testWriteDepTree(t *testing.T) { } // nil lock/result should err immediately - err = WriteDepTree(tmp, nil, sm, true, discardLogger) + err = WriteDepTree(tmp, nil, sm, true, discardLogger()) if err == nil { t.Errorf("Should error if nil lock is passed to WriteDepTree") } - err = WriteDepTree(tmp, r, sm, true, discardLogger) + err = WriteDepTree(tmp, r, sm, true, discardLogger()) if err != nil { t.Errorf("Unexpected error while creating vendor tree: %s", err) } @@ -143,6 +145,7 @@ func BenchmarkCreateVendorTree(b *testing.B) { } if clean { + logger := discardLogger() b.ResetTimer() b.StopTimer() exp := path.Join(tmp, "export") @@ -151,7 +154,7 @@ func BenchmarkCreateVendorTree(b *testing.B) { // ease manual inspection os.RemoveAll(exp) b.StartTimer() - err = WriteDepTree(exp, r, sm, true, discardLogger) + err = WriteDepTree(exp, r, sm, true, logger) b.StopTimer() if err != nil { b.Errorf("unexpected error after %v iterations: %s", i, err) diff --git a/test_project_context_test.go b/test_project_context_test.go index 09ffda6111..c0739d9270 100644 --- a/test_project_context_test.go +++ b/test_project_context_test.go @@ -39,8 +39,8 @@ func NewTestProjectContext(h *test.Helper, projectName string) *TestProjectConte var err error pc.Context = &Ctx{ GOPATH: pc.tempDir, - Out: discardLogger, - Err: discardLogger, + Out: discardLogger(), + Err: discardLogger(), } pc.SourceManager, err = pc.Context.SourceManager() h.Must(errors.Wrap(err, "Unable to create a SourceManager")) diff --git a/txn_writer_test.go b/txn_writer_test.go index 2178954704..141e1f8cc1 100644 --- a/txn_writer_test.go +++ b/txn_writer_test.go @@ -26,7 +26,7 @@ func TestSafeWriter_BadInput_MissingRoot(t *testing.T) { defer pc.Release() sw, _ := NewSafeWriter(nil, nil, nil, VendorOnChanged) - err := sw.Write("", pc.SourceManager, true, discardLogger) + err := sw.Write("", pc.SourceManager, true, discardLogger()) if err == nil { t.Fatal("should have errored without a root path, but did not") @@ -44,7 +44,7 @@ func TestSafeWriter_BadInput_MissingSourceManager(t *testing.T) { pc.Load() sw, _ := NewSafeWriter(nil, nil, pc.Project.Lock, VendorAlways) - err := sw.Write(pc.Project.AbsRoot, nil, true, discardLogger) + err := sw.Write(pc.Project.AbsRoot, nil, true, discardLogger()) if err == nil { t.Fatal("should have errored without a source manager when forceVendor is true, but did not") @@ -92,7 +92,7 @@ func TestSafeWriter_BadInput_NonexistentRoot(t *testing.T) { sw, _ := NewSafeWriter(nil, nil, nil, VendorOnChanged) missingroot := filepath.Join(pc.Project.AbsRoot, "nonexistent") - err := sw.Write(missingroot, pc.SourceManager, true, discardLogger) + err := sw.Write(missingroot, pc.SourceManager, true, discardLogger()) if err == nil { t.Fatal("should have errored with nonexistent dir for root path, but did not") @@ -110,7 +110,7 @@ func TestSafeWriter_BadInput_RootIsFile(t *testing.T) { sw, _ := NewSafeWriter(nil, nil, nil, VendorOnChanged) fileroot := pc.CopyFile("fileroot", "txn_writer/badinput_fileroot") - err := sw.Write(fileroot, pc.SourceManager, true, discardLogger) + err := sw.Write(fileroot, pc.SourceManager, true, discardLogger()) if err == nil { t.Fatal("should have errored when root path is a file, but did not") @@ -145,7 +145,7 @@ func TestSafeWriter_Manifest(t *testing.T) { } // Write changes - err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify file system changes @@ -190,7 +190,7 @@ func TestSafeWriter_ManifestAndUnmodifiedLock(t *testing.T) { } // Write changes - err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify file system changes @@ -235,7 +235,7 @@ func TestSafeWriter_ManifestAndUnmodifiedLockWithForceVendor(t *testing.T) { } // Write changes - err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify file system changes @@ -285,7 +285,7 @@ func TestSafeWriter_ModifiedLock(t *testing.T) { } // Write changes - err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify file system changes @@ -335,7 +335,7 @@ func TestSafeWriter_ModifiedLockSkipVendor(t *testing.T) { } // Write changes - err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify file system changes @@ -363,7 +363,7 @@ func TestSafeWriter_ForceVendorWhenVendorAlreadyExists(t *testing.T) { pc.Load() sw, _ := NewSafeWriter(nil, pc.Project.Lock, pc.Project.Lock, VendorAlways) - err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify prepared actions @@ -381,7 +381,7 @@ func TestSafeWriter_ForceVendorWhenVendorAlreadyExists(t *testing.T) { t.Fatal("Expected the payload to contain the vendor directory ") } - err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify file system changes @@ -431,7 +431,7 @@ func TestSafeWriter_NewLock(t *testing.T) { } // Write changes - err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify file system changes @@ -478,7 +478,7 @@ func TestSafeWriter_NewLockSkipVendor(t *testing.T) { } // Write changes - err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify file system changes @@ -571,7 +571,7 @@ func TestSafeWriter_VendorDotGitPreservedWithForceVendor(t *testing.T) { t.Fatal("Expected the payload to contain the vendor directory") } - err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger) + err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger()) h.Must(errors.Wrap(err, "SafeWriter.Write failed")) // Verify file system changes