Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 92657ba

Browse files
sdboyersdboyer
authored
Merge pull request #1165 from jmank88/discard_logger
testing: de-globalize discard loggers
2 parents 5aa4ffe + d61fa38 commit 92657ba

File tree

4 files changed

+32
-29
lines changed

4 files changed

+32
-29
lines changed

‎context_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
"github.com/golang/dep/internal/test"
1818
)
1919

20-
var (
21-
discardLogger = log.New(ioutil.Discard, "", 0)
22-
)
20+
func discardLogger() *log.Logger {
21+
return log.New(ioutil.Discard, "", 0)
22+
}
2323

2424
func TestCtx_ProjectImport(t *testing.T) {
2525
h := test.NewHelper(t)
@@ -127,8 +127,8 @@ func TestLoadProject(t *testing.T) {
127127
for _, tc := range testcases {
128128
t.Run(tc.name, func(t *testing.T) {
129129
ctx := &Ctx{
130-
Out: discardLogger,
131-
Err: discardLogger,
130+
Out: discardLogger(),
131+
Err: discardLogger(),
132132
}
133133

134134
err := ctx.SetPaths(h.Path(tc.wd), h.Path("."))
@@ -200,8 +200,8 @@ func TestLoadProjectManifestParseError(t *testing.T) {
200200
ctx := &Ctx{
201201
GOPATH: tg.Path("."),
202202
WorkingDir: wd,
203-
Out: discardLogger,
204-
Err: discardLogger,
203+
Out: discardLogger(),
204+
Err: discardLogger(),
205205
}
206206

207207
_, err = ctx.LoadProject()
@@ -231,8 +231,8 @@ func TestLoadProjectLockParseError(t *testing.T) {
231231
ctx := &Ctx{
232232
GOPATH: tg.Path("."),
233233
WorkingDir: wd,
234-
Out: discardLogger,
235-
Err: discardLogger,
234+
Out: discardLogger(),
235+
Err: discardLogger(),
236236
}
237237

238238
_, err = ctx.LoadProject()

‎internal/gps/result_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import (
1515
"github.com/golang/dep/internal/test"
1616
)
1717

18-
var discardLogger = log.New(ioutil.Discard, "", 0)
18+
func discardLogger() *log.Logger {
19+
return log.New(ioutil.Discard, "", 0)
20+
}
1921

2022
var basicResult solution
2123

@@ -95,12 +97,12 @@ func testWriteDepTree(t *testing.T) {
9597
}
9698

9799
// nil lock/result should err immediately
98-
err = WriteDepTree(tmp, nil, sm, true, discardLogger)
100+
err = WriteDepTree(tmp, nil, sm, true, discardLogger())
99101
if err == nil {
100102
t.Errorf("Should error if nil lock is passed to WriteDepTree")
101103
}
102104

103-
err = WriteDepTree(tmp, r, sm, true, discardLogger)
105+
err = WriteDepTree(tmp, r, sm, true, discardLogger())
104106
if err != nil {
105107
t.Errorf("Unexpected error while creating vendor tree: %s", err)
106108
}
@@ -143,6 +145,7 @@ func BenchmarkCreateVendorTree(b *testing.B) {
143145
}
144146

145147
if clean {
148+
logger := discardLogger()
146149
b.ResetTimer()
147150
b.StopTimer()
148151
exp := path.Join(tmp, "export")
@@ -151,7 +154,7 @@ func BenchmarkCreateVendorTree(b *testing.B) {
151154
// ease manual inspection
152155
os.RemoveAll(exp)
153156
b.StartTimer()
154-
err = WriteDepTree(exp, r, sm, true, discardLogger)
157+
err = WriteDepTree(exp, r, sm, true, logger)
155158
b.StopTimer()
156159
if err != nil {
157160
b.Errorf("unexpected error after %v iterations: %s", i, err)

‎test_project_context_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ func NewTestProjectContext(h *test.Helper, projectName string) *TestProjectConte
3939
var err error
4040
pc.Context = &Ctx{
4141
GOPATH: pc.tempDir,
42-
Out: discardLogger,
43-
Err: discardLogger,
42+
Out: discardLogger(),
43+
Err: discardLogger(),
4444
}
4545
pc.SourceManager, err = pc.Context.SourceManager()
4646
h.Must(errors.Wrap(err, "Unable to create a SourceManager"))

‎txn_writer_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestSafeWriter_BadInput_MissingRoot(t *testing.T) {
2626
defer pc.Release()
2727

2828
sw, _ := NewSafeWriter(nil, nil, nil, VendorOnChanged)
29-
err := sw.Write("", pc.SourceManager, true, discardLogger)
29+
err := sw.Write("", pc.SourceManager, true, discardLogger())
3030

3131
if err == nil {
3232
t.Fatal("should have errored without a root path, but did not")
@@ -44,7 +44,7 @@ func TestSafeWriter_BadInput_MissingSourceManager(t *testing.T) {
4444
pc.Load()
4545

4646
sw, _ := NewSafeWriter(nil, nil, pc.Project.Lock, VendorAlways)
47-
err := sw.Write(pc.Project.AbsRoot, nil, true, discardLogger)
47+
err := sw.Write(pc.Project.AbsRoot, nil, true, discardLogger())
4848

4949
if err == nil {
5050
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) {
9292
sw, _ := NewSafeWriter(nil, nil, nil, VendorOnChanged)
9393

9494
missingroot := filepath.Join(pc.Project.AbsRoot, "nonexistent")
95-
err := sw.Write(missingroot, pc.SourceManager, true, discardLogger)
95+
err := sw.Write(missingroot, pc.SourceManager, true, discardLogger())
9696

9797
if err == nil {
9898
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) {
110110
sw, _ := NewSafeWriter(nil, nil, nil, VendorOnChanged)
111111

112112
fileroot := pc.CopyFile("fileroot", "txn_writer/badinput_fileroot")
113-
err := sw.Write(fileroot, pc.SourceManager, true, discardLogger)
113+
err := sw.Write(fileroot, pc.SourceManager, true, discardLogger())
114114

115115
if err == nil {
116116
t.Fatal("should have errored when root path is a file, but did not")
@@ -145,7 +145,7 @@ func TestSafeWriter_Manifest(t *testing.T) {
145145
}
146146

147147
// Write changes
148-
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
148+
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
149149
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
150150

151151
// Verify file system changes
@@ -190,7 +190,7 @@ func TestSafeWriter_ManifestAndUnmodifiedLock(t *testing.T) {
190190
}
191191

192192
// Write changes
193-
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
193+
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
194194
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
195195

196196
// Verify file system changes
@@ -235,7 +235,7 @@ func TestSafeWriter_ManifestAndUnmodifiedLockWithForceVendor(t *testing.T) {
235235
}
236236

237237
// Write changes
238-
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
238+
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
239239
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
240240

241241
// Verify file system changes
@@ -285,7 +285,7 @@ func TestSafeWriter_ModifiedLock(t *testing.T) {
285285
}
286286

287287
// Write changes
288-
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
288+
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
289289
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
290290

291291
// Verify file system changes
@@ -335,7 +335,7 @@ func TestSafeWriter_ModifiedLockSkipVendor(t *testing.T) {
335335
}
336336

337337
// Write changes
338-
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
338+
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
339339
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
340340

341341
// Verify file system changes
@@ -363,7 +363,7 @@ func TestSafeWriter_ForceVendorWhenVendorAlreadyExists(t *testing.T) {
363363
pc.Load()
364364

365365
sw, _ := NewSafeWriter(nil, pc.Project.Lock, pc.Project.Lock, VendorAlways)
366-
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
366+
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
367367
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
368368

369369
// Verify prepared actions
@@ -381,7 +381,7 @@ func TestSafeWriter_ForceVendorWhenVendorAlreadyExists(t *testing.T) {
381381
t.Fatal("Expected the payload to contain the vendor directory ")
382382
}
383383

384-
err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
384+
err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
385385
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
386386

387387
// Verify file system changes
@@ -431,7 +431,7 @@ func TestSafeWriter_NewLock(t *testing.T) {
431431
}
432432

433433
// Write changes
434-
err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
434+
err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
435435
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
436436

437437
// Verify file system changes
@@ -478,7 +478,7 @@ func TestSafeWriter_NewLockSkipVendor(t *testing.T) {
478478
}
479479

480480
// Write changes
481-
err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
481+
err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
482482
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
483483

484484
// Verify file system changes
@@ -571,7 +571,7 @@ func TestSafeWriter_VendorDotGitPreservedWithForceVendor(t *testing.T) {
571571
t.Fatal("Expected the payload to contain the vendor directory")
572572
}
573573

574-
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger)
574+
err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
575575
h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
576576

577577
// Verify file system changes

0 commit comments

Comments
 (0)