Skip to content

Commit 584844e

Browse files
sdboyersdboyer
authored
Merge pull request sdboyer/gps#212 from jstemmer/test-cleanup
A bit of cleaning up the tests
2 parents a33a859 + 1b6303f commit 584844e

8 files changed

+45
-95
lines changed

‎constraint_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,7 @@ func TestSemverConstraintOps(t *testing.T) {
590590
// still an incomparable type
591591
c1, err := NewSemverConstraint("=1.0.0")
592592
if err != nil {
593-
t.Errorf("Failed to create constraint: %s", err)
594-
t.FailNow()
593+
t.Fatalf("Failed to create constraint: %s", err)
595594
}
596595

597596
if !c1.MatchesAny(any) {
@@ -610,8 +609,7 @@ func TestSemverConstraintOps(t *testing.T) {
610609

611610
c1, err = NewSemverConstraint(">= 1.0.0")
612611
if err != nil {
613-
t.Errorf("Failed to create constraint: %s", err)
614-
t.FailNow()
612+
t.Fatalf("Failed to create constraint: %s", err)
615613
}
616614

617615
if c1.Matches(v1) {

‎hash_test.go

+5-10
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ func TestHashInputs(t *testing.T) {
2121

2222
s, err := Prepare(params, newdepspecSM(fix.ds, nil))
2323
if err != nil {
24-
t.Errorf("Unexpected error while prepping solver: %s", err)
25-
t.FailNow()
24+
t.Fatalf("Unexpected error while prepping solver: %s", err)
2625
}
2726

2827
dig := s.HashInputs()
@@ -73,8 +72,7 @@ func TestHashInputsReqsIgs(t *testing.T) {
7372

7473
s, err := Prepare(params, newdepspecSM(fix.ds, nil))
7574
if err != nil {
76-
t.Errorf("Unexpected error while prepping solver: %s", err)
77-
t.FailNow()
75+
t.Fatalf("Unexpected error while prepping solver: %s", err)
7876
}
7977

8078
dig := s.HashInputs()
@@ -116,8 +114,7 @@ func TestHashInputsReqsIgs(t *testing.T) {
116114

117115
s, err = Prepare(params, newdepspecSM(fix.ds, nil))
118116
if err != nil {
119-
t.Errorf("Unexpected error while prepping solver: %s", err)
120-
t.FailNow()
117+
t.Fatalf("Unexpected error while prepping solver: %s", err)
121118
}
122119

123120
dig = s.HashInputs()
@@ -157,8 +154,7 @@ func TestHashInputsReqsIgs(t *testing.T) {
157154

158155
s, err = Prepare(params, newdepspecSM(fix.ds, nil))
159156
if err != nil {
160-
t.Errorf("Unexpected error while prepping solver: %s", err)
161-
t.FailNow()
157+
t.Fatalf("Unexpected error while prepping solver: %s", err)
162158
}
163159

164160
dig = s.HashInputs()
@@ -522,8 +518,7 @@ func TestHashInputsOverrides(t *testing.T) {
522518

523519
s, err := Prepare(params, newdepspecSM(basefix.ds, nil))
524520
if err != nil {
525-
t.Errorf("(fix: %q) Unexpected error while prepping solver: %s", fix.name, err)
526-
t.FailNow()
521+
t.Fatalf("(fix: %q) Unexpected error while prepping solver: %s", fix.name, err)
527522
}
528523

529524
h := sha256.New()

‎manager_test.go

+6-12
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,12 @@ func sv(s string) *semver.Version {
4343
func mkNaiveSM(t *testing.T) (*SourceMgr, func()) {
4444
cpath, err := ioutil.TempDir("", "smcache")
4545
if err != nil {
46-
t.Errorf("Failed to create temp dir: %s", err)
47-
t.FailNow()
46+
t.Fatalf("Failed to create temp dir: %s", err)
4847
}
4948

5049
sm, err := NewSourceManager(cpath)
5150
if err != nil {
52-
t.Errorf("Unexpected error on SourceManager creation: %s", err)
53-
t.FailNow()
51+
t.Fatalf("Unexpected error on SourceManager creation: %s", err)
5452
}
5553

5654
return sm, func() {
@@ -68,8 +66,7 @@ func remakeNaiveSM(osm *SourceMgr, t *testing.T) (*SourceMgr, func()) {
6866

6967
sm, err := NewSourceManager(cpath)
7068
if err != nil {
71-
t.Errorf("unexpected error on SourceManager recreation: %s", err)
72-
t.FailNow()
69+
t.Fatalf("unexpected error on SourceManager recreation: %s", err)
7370
}
7471

7572
return sm, func() {
@@ -115,8 +112,7 @@ func TestSourceManagerInit(t *testing.T) {
115112
}
116113

117114
if _, err = os.Stat(path.Join(cpath, "sm.lock")); !os.IsNotExist(err) {
118-
t.Errorf("Global cache lock file not cleared correctly on Release()")
119-
t.FailNow()
115+
t.Fatalf("Global cache lock file not cleared correctly on Release()")
120116
}
121117

122118
// Set another one up at the same spot now, just to be sure
@@ -140,14 +136,12 @@ func TestSourceInit(t *testing.T) {
140136

141137
cpath, err := ioutil.TempDir("", "smcache")
142138
if err != nil {
143-
t.Errorf("Failed to create temp dir: %s", err)
144-
t.FailNow()
139+
t.Fatalf("Failed to create temp dir: %s", err)
145140
}
146141

147142
sm, err := NewSourceManager(cpath)
148143
if err != nil {
149-
t.Errorf("Unexpected error on SourceManager creation: %s", err)
150-
t.FailNow()
144+
t.Fatalf("Unexpected error on SourceManager creation: %s", err)
151145
}
152146

153147
defer func() {

‎pkgtree/pkgtree_test.go

+5-10
Original file line numberDiff line numberDiff line change
@@ -1352,8 +1352,7 @@ func TestListPackagesNoPerms(t *testing.T) {
13521352
}
13531353
tmp, err := ioutil.TempDir("", "listpkgsnp")
13541354
if err != nil {
1355-
t.Errorf("Failed to create temp dir: %s", err)
1356-
t.FailNow()
1355+
t.Fatalf("Failed to create temp dir: %s", err)
13571356
}
13581357
defer os.RemoveAll(tmp)
13591358

@@ -1364,13 +1363,11 @@ func TestListPackagesNoPerms(t *testing.T) {
13641363
// chmod the simple dir and m1p/b.go file so they can't be read
13651364
err = os.Chmod(filepath.Join(workdir, "simple"), 0)
13661365
if err != nil {
1367-
t.Error("Error while chmodding simple dir", err)
1368-
t.FailNow()
1366+
t.Fatalf("Error while chmodding simple dir: %s", err)
13691367
}
13701368
os.Chmod(filepath.Join(workdir, "m1p", "b.go"), 0)
13711369
if err != nil {
1372-
t.Error("Error while chmodding b.go file", err)
1373-
t.FailNow()
1370+
t.Fatalf("Error while chmodding b.go file: %s", err)
13741371
}
13751372

13761373
want := PackageTree{
@@ -1398,12 +1395,10 @@ func TestListPackagesNoPerms(t *testing.T) {
13981395
got, err := ListPackages(workdir, "ren")
13991396

14001397
if err != nil {
1401-
t.Errorf("Unexpected err from ListPackages: %s", err)
1402-
t.FailNow()
1398+
t.Fatalf("Unexpected err from ListPackages: %s", err)
14031399
}
14041400
if want.ImportRoot != got.ImportRoot {
1405-
t.Errorf("Expected ImportRoot %s, got %s", want.ImportRoot, got.ImportRoot)
1406-
t.FailNow()
1401+
t.Fatalf("Expected ImportRoot %s, got %s", want.ImportRoot, got.ImportRoot)
14071402
}
14081403

14091404
if !reflect.DeepEqual(got, want) {

‎result_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ func testWriteDepTree(t *testing.T) {
5050

5151
tmp, err := ioutil.TempDir("", "writetree")
5252
if err != nil {
53-
t.Errorf("Failed to create temp dir: %s", err)
54-
t.FailNow()
53+
t.Fatalf("Failed to create temp dir: %s", err)
5554
}
5655
defer os.RemoveAll(tmp)
5756

‎rootdata_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ func TestRootdataExternalImports(t *testing.T) {
1717

1818
is, err := Prepare(params, newdepspecSM(fix.ds, nil))
1919
if err != nil {
20-
t.Errorf("Unexpected error while prepping solver: %s", err)
21-
t.FailNow()
20+
t.Fatalf("Unexpected error while prepping solver: %s", err)
2221
}
2322
rd := is.(*solver).rd
2423

@@ -71,8 +70,7 @@ func TestGetApplicableConstraints(t *testing.T) {
7170

7271
is, err := Prepare(params, newdepspecSM(fix.ds, nil))
7372
if err != nil {
74-
t.Errorf("Unexpected error while prepping solver: %s", err)
75-
t.FailNow()
73+
t.Fatalf("Unexpected error while prepping solver: %s", err)
7674
}
7775
rd := is.(*solver).rd
7876

‎vcs_source_test.go

+23-51
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,17 @@ func testGitSourceInteractions(t *testing.T) {
3838
if err != nil {
3939
t.Errorf("Failed to create temp dir: %s", err)
4040
}
41-
rf := func() {
42-
err := removeAll(cpath)
43-
if err != nil {
41+
defer func() {
42+
if err := removeAll(cpath); err != nil {
4443
t.Errorf("removeAll failed: %s", err)
4544
}
46-
}
45+
}()
4746

4847
n := "github.com/sdboyer/gpkt"
4948
un := "https://" + n
5049
u, err := url.Parse(un)
5150
if err != nil {
52-
t.Errorf("URL was bad, lolwut? errtext: %s", err)
53-
rf()
54-
t.FailNow()
51+
t.Fatalf("Error parsing URL %s: %s", un, err)
5552
}
5653
mb := maybeGitSource{
5754
url: u,
@@ -61,9 +58,7 @@ func testGitSourceInteractions(t *testing.T) {
6158
superv := newSupervisor(ctx)
6259
isrc, state, err := mb.try(ctx, cpath, newMemoryCache(), superv)
6360
if err != nil {
64-
t.Errorf("Unexpected error while setting up gitSource for test repo: %s", err)
65-
rf()
66-
t.FailNow()
61+
t.Fatalf("Unexpected error while setting up gitSource for test repo: %s", err)
6762
}
6863

6964
wantstate := sourceIsSetUp | sourceExistsUpstream | sourceHasLatestVersionList
@@ -73,16 +68,12 @@ func testGitSourceInteractions(t *testing.T) {
7368

7469
err = isrc.initLocal(ctx)
7570
if err != nil {
76-
t.Errorf("Error on cloning git repo: %s", err)
77-
rf()
78-
t.FailNow()
71+
t.Fatalf("Error on cloning git repo: %s", err)
7972
}
8073

8174
src, ok := isrc.(*gitSource)
8275
if !ok {
83-
t.Errorf("Expected a gitSource, got a %T", isrc)
84-
rf()
85-
t.FailNow()
76+
t.Fatalf("Expected a gitSource, got a %T", isrc)
8677
}
8778

8879
if un != src.upstreamURL() {
@@ -91,9 +82,7 @@ func testGitSourceInteractions(t *testing.T) {
9182

9283
pvlist, err := src.listVersions(ctx)
9384
if err != nil {
94-
t.Errorf("Unexpected error getting version pairs from git repo: %s", err)
95-
rf()
96-
t.FailNow()
85+
t.Fatalf("Unexpected error getting version pairs from git repo: %s", err)
9786
}
9887

9988
vlist := hidePair(pvlist)
@@ -145,12 +134,11 @@ func testGopkginSourceInteractions(t *testing.T) {
145134
if err != nil {
146135
t.Errorf("Failed to create temp dir: %s", err)
147136
}
148-
rf := func() {
149-
err := removeAll(cpath)
150-
if err != nil {
137+
defer func() {
138+
if err := removeAll(cpath); err != nil {
151139
t.Errorf("removeAll failed: %s", err)
152140
}
153-
}
141+
}()
154142

155143
tfunc := func(opath, n string, major uint64, evl []Version) {
156144
un := "https://" + n
@@ -180,9 +168,7 @@ func testGopkginSourceInteractions(t *testing.T) {
180168

181169
err = isrc.initLocal(ctx)
182170
if err != nil {
183-
t.Errorf("Error on cloning git repo: %s", err)
184-
rf()
185-
t.FailNow()
171+
t.Fatalf("Error on cloning git repo: %s", err)
186172
}
187173

188174
src, ok := isrc.(*gopkginSource)
@@ -275,7 +261,6 @@ func testGopkginSourceInteractions(t *testing.T) {
275261
}()
276262

277263
wg.Wait()
278-
rf()
279264
}
280265

281266
func testBzrSourceInteractions(t *testing.T) {
@@ -291,20 +276,17 @@ func testBzrSourceInteractions(t *testing.T) {
291276
if err != nil {
292277
t.Errorf("Failed to create temp dir: %s", err)
293278
}
294-
rf := func() {
295-
err := removeAll(cpath)
296-
if err != nil {
279+
defer func() {
280+
if err := removeAll(cpath); err != nil {
297281
t.Errorf("removeAll failed: %s", err)
298282
}
299-
}
283+
}()
300284

301285
n := "launchpad.net/govcstestbzrrepo"
302286
un := "https://" + n
303287
u, err := url.Parse(un)
304288
if err != nil {
305-
t.Errorf("URL was bad, lolwut? errtext: %s", err)
306-
rf()
307-
t.FailNow()
289+
t.Fatalf("Error parsing URL %s: %s", un, err)
308290
}
309291
mb := maybeBzrSource{
310292
url: u,
@@ -314,9 +296,7 @@ func testBzrSourceInteractions(t *testing.T) {
314296
superv := newSupervisor(ctx)
315297
isrc, state, err := mb.try(ctx, cpath, newMemoryCache(), superv)
316298
if err != nil {
317-
t.Errorf("Unexpected error while setting up bzrSource for test repo: %s", err)
318-
rf()
319-
t.FailNow()
299+
t.Fatalf("Unexpected error while setting up bzrSource for test repo: %s", err)
320300
}
321301

322302
wantstate := sourceIsSetUp | sourceExistsUpstream
@@ -326,16 +306,12 @@ func testBzrSourceInteractions(t *testing.T) {
326306

327307
err = isrc.initLocal(ctx)
328308
if err != nil {
329-
t.Errorf("Error on cloning git repo: %s", err)
330-
rf()
331-
t.FailNow()
309+
t.Fatalf("Error on cloning git repo: %s", err)
332310
}
333311

334312
src, ok := isrc.(*bzrSource)
335313
if !ok {
336-
t.Errorf("Expected a bzrSource, got a %T", isrc)
337-
rf()
338-
t.FailNow()
314+
t.Fatalf("Expected a bzrSource, got a %T", isrc)
339315
}
340316

341317
if state != wantstate {
@@ -410,12 +386,11 @@ func testHgSourceInteractions(t *testing.T) {
410386
if err != nil {
411387
t.Errorf("Failed to create temp dir: %s", err)
412388
}
413-
rf := func() {
414-
err := removeAll(cpath)
415-
if err != nil {
389+
defer func() {
390+
if err := removeAll(cpath); err != nil {
416391
t.Errorf("removeAll failed: %s", err)
417392
}
418-
}
393+
}()
419394

420395
tfunc := func(n string, evl []Version) {
421396
un := "https://" + n
@@ -443,9 +418,7 @@ func testHgSourceInteractions(t *testing.T) {
443418

444419
err = isrc.initLocal(ctx)
445420
if err != nil {
446-
t.Errorf("Error on cloning git repo: %s", err)
447-
rf()
448-
t.FailNow()
421+
t.Fatalf("Error on cloning git repo: %s", err)
449422
}
450423

451424
src, ok := isrc.(*hgSource)
@@ -530,7 +503,6 @@ func testHgSourceInteractions(t *testing.T) {
530503
})
531504

532505
<-donech
533-
rf()
534506
}
535507

536508
// Fail a test if the specified binaries aren't installed.

‎version_queue_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ func TestVersionQueueAdvance(t *testing.T) {
136136
// First with no prefv or lockv
137137
vq, err := newVersionQueue(id, nil, nil, fb)
138138
if err != nil {
139-
t.Errorf("Unexpected err on vq create: %s", err)
140-
t.FailNow()
139+
t.Fatalf("Unexpected err on vq create: %s", err)
141140
}
142141

143142
for k, v := range fakevl[1:] {

0 commit comments

Comments
 (0)