coreiface: add a testing.T argument to the provider
This is usefull because it allows the Provider to use t.Cleanup for cleaning up the nodes. This commit was moved from ipfs/boxo@c23df3837fbe224259a60e8eed9d77e2656f2dce
Jorropo committed
May 30, 2023 at 19:08 UTC
18143e2bb38a00b778b4eefc7a31077cf556b480
12 files changed
+91
-91
core/coreiface/tests/api.go
+10
-10
@@ -13,10 +13,10 @@ var errAPINotImplemented = errors.New("api not implemented")
13
14
type Provider interface {
15
// Make creates n nodes. fullIdentity set to false can be ignored
16
- MakeAPISwarm(ctx context.Context, fullIdentity bool, online bool, n int) ([]coreiface.CoreAPI, error)
16
+ MakeAPISwarm(t *testing.T, ctx context.Context, fullIdentity bool, online bool, n int) ([]coreiface.CoreAPI, error)
17
}
18
19
-func (tp *TestSuite) makeAPISwarm(ctx context.Context, fullIdentity bool, online bool, n int) ([]coreiface.CoreAPI, error) {
19
+func (tp *TestSuite) makeAPISwarm(t *testing.T, ctx context.Context, fullIdentity bool, online bool, n int) ([]coreiface.CoreAPI, error) {
20
if tp.apis != nil {
21
tp.apis <- 1
22
go func() {
@@ -25,11 +25,11 @@ func (tp *TestSuite) makeAPISwarm(ctx context.Context, fullIdentity bool, online
25
}()
26
}
27
28
- return tp.Provider.MakeAPISwarm(ctx, fullIdentity, online, n)
28
+ return tp.Provider.MakeAPISwarm(t, ctx, fullIdentity, online, n)
29
}
30
31
-func (tp *TestSuite) makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
32
- api, err := tp.makeAPISwarm(ctx, false, false, 1)
31
+func (tp *TestSuite) makeAPI(t *testing.T, ctx context.Context) (coreiface.CoreAPI, error) {
32
+ api, err := tp.makeAPISwarm(t, ctx, false, false, 1)
33
if err != nil {
34
return nil, err
35
}
@@ -37,8 +37,8 @@ func (tp *TestSuite) makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
37
return api[0], nil
38
}
39
40
-func (tp *TestSuite) makeAPIWithIdentityAndOffline(ctx context.Context) (coreiface.CoreAPI, error) {
41
- api, err := tp.makeAPISwarm(ctx, true, false, 1)
40
+func (tp *TestSuite) makeAPIWithIdentityAndOffline(t *testing.T, ctx context.Context) (coreiface.CoreAPI, error) {
41
+ api, err := tp.makeAPISwarm(t, ctx, true, false, 1)
42
if err != nil {
43
return nil, err
44
}
@@ -46,8 +46,8 @@ func (tp *TestSuite) makeAPIWithIdentityAndOffline(ctx context.Context) (coreifa
46
return api[0], nil
47
}
48
49
-func (tp *TestSuite) MakeAPISwarm(ctx context.Context, n int) ([]coreiface.CoreAPI, error) {
50
- return tp.makeAPISwarm(ctx, true, true, n)
49
+func (tp *TestSuite) MakeAPISwarm(t *testing.T, ctx context.Context, n int) ([]coreiface.CoreAPI, error) {
50
+ return tp.makeAPISwarm(t, ctx, true, true, n)
51
}
52
53
type TestSuite struct {
@@ -99,7 +99,7 @@ func TestApi(p Provider) func(t *testing.T) {
99
func (tp *TestSuite) hasApi(t *testing.T, tf func(coreiface.CoreAPI) error) {
100
ctx, cancel := context.WithCancel(context.Background())
101
defer cancel()
102
- api, err := tp.makeAPI(ctx)
102
+ api, err := tp.makeAPI(t, ctx)
103
if err != nil {
104
t.Fatal(err)
105
}
core/coreiface/tests/block.go
+11
-11
@@ -58,7 +58,7 @@ func (tp *TestSuite) TestBlock(t *testing.T) {
58
func (tp *TestSuite) TestBlockPut(t *testing.T) {
59
ctx, cancel := context.WithCancel(context.Background())
60
defer cancel()
61
- api, err := tp.makeAPI(ctx)
61
+ api, err := tp.makeAPI(t, ctx)
62
if err != nil {
63
t.Fatal(err)
64
}
@@ -78,7 +78,7 @@ func (tp *TestSuite) TestBlockPut(t *testing.T) {
78
func (tp *TestSuite) TestBlockPutFormatDagCbor(t *testing.T) {
79
ctx, cancel := context.WithCancel(context.Background())
80
defer cancel()
81
- api, err := tp.makeAPI(ctx)
81
+ api, err := tp.makeAPI(t, ctx)
82
if err != nil {
83
t.Fatal(err)
84
}
@@ -98,7 +98,7 @@ func (tp *TestSuite) TestBlockPutFormatDagCbor(t *testing.T) {
98
func (tp *TestSuite) TestBlockPutFormatDagPb(t *testing.T) {
99
ctx, cancel := context.WithCancel(context.Background())
100
defer cancel()
101
- api, err := tp.makeAPI(ctx)
101
+ api, err := tp.makeAPI(t, ctx)
102
if err != nil {
103
t.Fatal(err)
104
}
@@ -118,7 +118,7 @@ func (tp *TestSuite) TestBlockPutFormatDagPb(t *testing.T) {
118
func (tp *TestSuite) TestBlockPutFormatV0(t *testing.T) {
119
ctx, cancel := context.WithCancel(context.Background())
120
defer cancel()
121
- api, err := tp.makeAPI(ctx)
121
+ api, err := tp.makeAPI(t, ctx)
122
if err != nil {
123
t.Fatal(err)
124
}
@@ -136,7 +136,7 @@ func (tp *TestSuite) TestBlockPutFormatV0(t *testing.T) {
136
func (tp *TestSuite) TestBlockPutCidCodecDagCbor(t *testing.T) {
137
ctx, cancel := context.WithCancel(context.Background())
138
defer cancel()
139
- api, err := tp.makeAPI(ctx)
139
+ api, err := tp.makeAPI(t, ctx)
140
if err != nil {
141
t.Fatal(err)
142
}
@@ -154,7 +154,7 @@ func (tp *TestSuite) TestBlockPutCidCodecDagCbor(t *testing.T) {
154
func (tp *TestSuite) TestBlockPutCidCodecDagPb(t *testing.T) {
155
ctx, cancel := context.WithCancel(context.Background())
156
defer cancel()
157
- api, err := tp.makeAPI(ctx)
157
+ api, err := tp.makeAPI(t, ctx)
158
if err != nil {
159
t.Fatal(err)
160
}
@@ -172,7 +172,7 @@ func (tp *TestSuite) TestBlockPutCidCodecDagPb(t *testing.T) {
172
func (tp *TestSuite) TestBlockPutHash(t *testing.T) {
173
ctx, cancel := context.WithCancel(context.Background())
174
defer cancel()
175
- api, err := tp.makeAPI(ctx)
175
+ api, err := tp.makeAPI(t, ctx)
176
if err != nil {
177
t.Fatal(err)
178
}
@@ -195,7 +195,7 @@ func (tp *TestSuite) TestBlockPutHash(t *testing.T) {
195
func (tp *TestSuite) TestBlockGet(t *testing.T) {
196
ctx, cancel := context.WithCancel(context.Background())
197
defer cancel()
198
- api, err := tp.makeAPI(ctx)
198
+ api, err := tp.makeAPI(t, ctx)
199
if err != nil {
200
t.Fatal(err)
201
}
@@ -233,7 +233,7 @@ func (tp *TestSuite) TestBlockGet(t *testing.T) {
233
func (tp *TestSuite) TestBlockRm(t *testing.T) {
234
ctx, cancel := context.WithCancel(context.Background())
235
defer cancel()
236
- api, err := tp.makeAPI(ctx)
236
+ api, err := tp.makeAPI(t, ctx)
237
if err != nil {
238
t.Fatal(err)
239
}
@@ -287,7 +287,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
287
func (tp *TestSuite) TestBlockStat(t *testing.T) {
288
ctx, cancel := context.WithCancel(context.Background())
289
defer cancel()
290
- api, err := tp.makeAPI(ctx)
290
+ api, err := tp.makeAPI(t, ctx)
291
if err != nil {
292
t.Fatal(err)
293
}
@@ -314,7 +314,7 @@ func (tp *TestSuite) TestBlockStat(t *testing.T) {
314
func (tp *TestSuite) TestBlockPin(t *testing.T) {
315
ctx, cancel := context.WithCancel(context.Background())
316
defer cancel()
317
- api, err := tp.makeAPI(ctx)
317
+ api, err := tp.makeAPI(t, ctx)
318
if err != nil {
319
t.Fatal(err)
320
}
core/coreiface/tests/dag.go
+5
-5
@@ -44,7 +44,7 @@ var (
44
func (tp *TestSuite) TestPut(t *testing.T) {
45
ctx, cancel := context.WithCancel(context.Background())
46
defer cancel()
47
- api, err := tp.makeAPI(ctx)
47
+ api, err := tp.makeAPI(t, ctx)
48
if err != nil {
49
t.Fatal(err)
50
}
@@ -67,7 +67,7 @@ func (tp *TestSuite) TestPut(t *testing.T) {
67
func (tp *TestSuite) TestPutWithHash(t *testing.T) {
68
ctx, cancel := context.WithCancel(context.Background())
69
defer cancel()
70
- api, err := tp.makeAPI(ctx)
70
+ api, err := tp.makeAPI(t, ctx)
71
if err != nil {
72
t.Fatal(err)
73
}
@@ -90,7 +90,7 @@ func (tp *TestSuite) TestPutWithHash(t *testing.T) {
90
func (tp *TestSuite) TestDagPath(t *testing.T) {
91
ctx, cancel := context.WithCancel(context.Background())
92
defer cancel()
93
- api, err := tp.makeAPI(ctx)
93
+ api, err := tp.makeAPI(t, ctx)
94
if err != nil {
95
t.Fatal(err)
96
}
@@ -135,7 +135,7 @@ func (tp *TestSuite) TestDagPath(t *testing.T) {
135
func (tp *TestSuite) TestTree(t *testing.T) {
136
ctx, cancel := context.WithCancel(context.Background())
137
defer cancel()
138
- api, err := tp.makeAPI(ctx)
138
+ api, err := tp.makeAPI(t, ctx)
139
if err != nil {
140
t.Fatal(err)
141
}
@@ -170,7 +170,7 @@ func (tp *TestSuite) TestTree(t *testing.T) {
170
func (tp *TestSuite) TestBatch(t *testing.T) {
171
ctx, cancel := context.WithCancel(context.Background())
172
defer cancel()
173
- api, err := tp.makeAPI(ctx)
173
+ api, err := tp.makeAPI(t, ctx)
174
if err != nil {
175
t.Fatal(err)
176
}
core/coreiface/tests/dht.go
+3
-3
@@ -26,7 +26,7 @@ func (tp *TestSuite) TestDht(t *testing.T) {
26
func (tp *TestSuite) TestDhtFindPeer(t *testing.T) {
27
ctx, cancel := context.WithCancel(context.Background())
28
defer cancel()
29
- apis, err := tp.MakeAPISwarm(ctx, 5)
29
+ apis, err := tp.MakeAPISwarm(t, ctx, 5)
30
if err != nil {
31
t.Fatal(err)
32
}
@@ -81,7 +81,7 @@ func (tp *TestSuite) TestDhtFindPeer(t *testing.T) {
81
func (tp *TestSuite) TestDhtFindProviders(t *testing.T) {
82
ctx, cancel := context.WithCancel(context.Background())
83
defer cancel()
84
- apis, err := tp.MakeAPISwarm(ctx, 5)
84
+ apis, err := tp.MakeAPISwarm(t, ctx, 5)
85
if err != nil {
86
t.Fatal(err)
87
}
@@ -113,7 +113,7 @@ func (tp *TestSuite) TestDhtFindProviders(t *testing.T) {
113
func (tp *TestSuite) TestDhtProvide(t *testing.T) {
114
ctx, cancel := context.WithCancel(context.Background())
115
defer cancel()
116
- apis, err := tp.MakeAPISwarm(ctx, 5)
116
+ apis, err := tp.MakeAPISwarm(t, ctx, 5)
117
if err != nil {
118
t.Fatal(err)
119
}
core/coreiface/tests/key.go
+16
-16
@@ -40,7 +40,7 @@ func (tp *TestSuite) TestKey(t *testing.T) {
40
func (tp *TestSuite) TestListSelf(t *testing.T) {
41
ctx, cancel := context.WithCancel(context.Background())
42
defer cancel()
43
- api, err := tp.makeAPI(ctx)
43
+ api, err := tp.makeAPI(t, ctx)
44
if err != nil {
45
t.Fatal(err)
46
return
@@ -74,7 +74,7 @@ func (tp *TestSuite) TestListSelf(t *testing.T) {
74
func (tp *TestSuite) TestRenameSelf(t *testing.T) {
75
ctx, cancel := context.WithCancel(context.Background())
76
defer cancel()
77
- api, err := tp.makeAPI(ctx)
77
+ api, err := tp.makeAPI(t, ctx)
78
if err != nil {
79
t.Fatal(err)
80
return
@@ -102,7 +102,7 @@ func (tp *TestSuite) TestRenameSelf(t *testing.T) {
102
func (tp *TestSuite) TestRemoveSelf(t *testing.T) {
103
ctx, cancel := context.WithCancel(context.Background())
104
defer cancel()
105
- api, err := tp.makeAPI(ctx)
105
+ api, err := tp.makeAPI(t, ctx)
106
if err != nil {
107
t.Fatal(err)
108
return
@@ -121,7 +121,7 @@ func (tp *TestSuite) TestRemoveSelf(t *testing.T) {
121
func (tp *TestSuite) TestGenerate(t *testing.T) {
122
ctx, cancel := context.WithCancel(context.Background())
123
defer cancel()
124
- api, err := tp.makeAPI(ctx)
124
+ api, err := tp.makeAPI(t, ctx)
125
if err != nil {
126
t.Fatal(err)
127
}
@@ -165,7 +165,7 @@ func verifyIPNSPath(t *testing.T, p string) bool {
165
func (tp *TestSuite) TestGenerateSize(t *testing.T) {
166
ctx, cancel := context.WithCancel(context.Background())
167
defer cancel()
168
- api, err := tp.makeAPI(ctx)
168
+ api, err := tp.makeAPI(t, ctx)
169
if err != nil {
170
t.Fatal(err)
171
}
@@ -189,7 +189,7 @@ func (tp *TestSuite) TestGenerateType(t *testing.T) {
189
ctx, cancel := context.WithCancel(context.Background())
190
defer cancel()
191
192
- api, err := tp.makeAPI(ctx)
192
+ api, err := tp.makeAPI(t, ctx)
193
if err != nil {
194
t.Fatal(err)
195
}
@@ -213,7 +213,7 @@ func (tp *TestSuite) TestGenerateType(t *testing.T) {
213
func (tp *TestSuite) TestGenerateExisting(t *testing.T) {
214
ctx, cancel := context.WithCancel(context.Background())
215
defer cancel()
216
- api, err := tp.makeAPI(ctx)
216
+ api, err := tp.makeAPI(t, ctx)
217
if err != nil {
218
t.Fatal(err)
219
}
@@ -246,7 +246,7 @@ func (tp *TestSuite) TestGenerateExisting(t *testing.T) {
246
func (tp *TestSuite) TestList(t *testing.T) {
247
ctx, cancel := context.WithCancel(context.Background())
248
defer cancel()
249
- api, err := tp.makeAPI(ctx)
249
+ api, err := tp.makeAPI(t, ctx)
250
if err != nil {
251
t.Fatal(err)
252
}
@@ -285,7 +285,7 @@ func (tp *TestSuite) TestList(t *testing.T) {
285
func (tp *TestSuite) TestRename(t *testing.T) {
286
ctx, cancel := context.WithCancel(context.Background())
287
defer cancel()
288
- api, err := tp.makeAPI(ctx)
288
+ api, err := tp.makeAPI(t, ctx)
289
if err != nil {
290
t.Fatal(err)
291
}
@@ -314,7 +314,7 @@ func (tp *TestSuite) TestRename(t *testing.T) {
314
func (tp *TestSuite) TestRenameToSelf(t *testing.T) {
315
ctx, cancel := context.WithCancel(context.Background())
316
defer cancel()
317
- api, err := tp.makeAPI(ctx)
317
+ api, err := tp.makeAPI(t, ctx)
318
if err != nil {
319
t.Fatal(err)
320
}
@@ -338,7 +338,7 @@ func (tp *TestSuite) TestRenameToSelf(t *testing.T) {
338
func (tp *TestSuite) TestRenameToSelfForce(t *testing.T) {
339
ctx, cancel := context.WithCancel(context.Background())
340
defer cancel()
341
- api, err := tp.makeAPI(ctx)
341
+ api, err := tp.makeAPI(t, ctx)
342
if err != nil {
343
t.Fatal(err)
344
}
@@ -362,7 +362,7 @@ func (tp *TestSuite) TestRenameToSelfForce(t *testing.T) {
362
func (tp *TestSuite) TestRenameOverwriteNoForce(t *testing.T) {
363
ctx, cancel := context.WithCancel(context.Background())
364
defer cancel()
365
- api, err := tp.makeAPI(ctx)
365
+ api, err := tp.makeAPI(t, ctx)
366
if err != nil {
367
t.Fatal(err)
368
}
@@ -392,7 +392,7 @@ func (tp *TestSuite) TestRenameOverwriteNoForce(t *testing.T) {
392
func (tp *TestSuite) TestRenameOverwrite(t *testing.T) {
393
ctx, cancel := context.WithCancel(context.Background())
394
defer cancel()
395
- api, err := tp.makeAPI(ctx)
395
+ api, err := tp.makeAPI(t, ctx)
396
if err != nil {
397
t.Fatal(err)
398
}
@@ -431,7 +431,7 @@ func (tp *TestSuite) TestRenameOverwrite(t *testing.T) {
431
func (tp *TestSuite) TestRenameSameNameNoForce(t *testing.T) {
432
ctx, cancel := context.WithCancel(context.Background())
433
defer cancel()
434
- api, err := tp.makeAPI(ctx)
434
+ api, err := tp.makeAPI(t, ctx)
435
if err != nil {
436
t.Fatal(err)
437
}
@@ -460,7 +460,7 @@ func (tp *TestSuite) TestRenameSameNameNoForce(t *testing.T) {
460
func (tp *TestSuite) TestRenameSameName(t *testing.T) {
461
ctx, cancel := context.WithCancel(context.Background())
462
defer cancel()
463
- api, err := tp.makeAPI(ctx)
463
+ api, err := tp.makeAPI(t, ctx)
464
if err != nil {
465
t.Fatal(err)
466
}
@@ -489,7 +489,7 @@ func (tp *TestSuite) TestRenameSameName(t *testing.T) {
489
func (tp *TestSuite) TestRemove(t *testing.T) {
490
ctx, cancel := context.WithCancel(context.Background())
491
defer cancel()
492
- api, err := tp.makeAPI(ctx)
492
+ api, err := tp.makeAPI(t, ctx)
493
if err != nil {
494
t.Fatal(err)
495
}
core/coreiface/tests/name.go
+3
-3
@@ -43,7 +43,7 @@ func (tp *TestSuite) TestPublishResolve(t *testing.T) {
43
ctx, cancel := context.WithCancel(context.Background())
44
defer cancel()
45
init := func() (coreiface.CoreAPI, path.Path) {
46
- apis, err := tp.MakeAPISwarm(ctx, 5)
46
+ apis, err := tp.MakeAPISwarm(t, ctx, 5)
47
if err != nil {
48
t.Fatal(err)
49
return nil, nil
@@ -191,7 +191,7 @@ func (tp *TestSuite) TestPublishResolve(t *testing.T) {
191
func (tp *TestSuite) TestBasicPublishResolveKey(t *testing.T) {
192
ctx, cancel := context.WithCancel(context.Background())
193
defer cancel()
194
- apis, err := tp.MakeAPISwarm(ctx, 5)
194
+ apis, err := tp.MakeAPISwarm(t, ctx, 5)
195
if err != nil {
196
t.Fatal(err)
197
}
@@ -235,7 +235,7 @@ func (tp *TestSuite) TestBasicPublishResolveTimeout(t *testing.T) {
235
236
ctx, cancel := context.WithCancel(context.Background())
237
defer cancel()
238
- apis, err := tp.MakeAPISwarm(ctx, 5)
238
+ apis, err := tp.MakeAPISwarm(t, ctx, 5)
239
if err != nil {
240
t.Fatal(err)
241
}
core/coreiface/tests/object.go
+12
-12
@@ -37,7 +37,7 @@ func (tp *TestSuite) TestObject(t *testing.T) {
37
func (tp *TestSuite) TestNew(t *testing.T) {
38
ctx, cancel := context.WithCancel(context.Background())
39
defer cancel()
40
- api, err := tp.makeAPI(ctx)
40
+ api, err := tp.makeAPI(t, ctx)
41
if err != nil {
42
t.Fatal(err)
43
}
@@ -64,7 +64,7 @@ func (tp *TestSuite) TestNew(t *testing.T) {
64
func (tp *TestSuite) TestObjectPut(t *testing.T) {
65
ctx, cancel := context.WithCancel(context.Background())
66
defer cancel()
67
- api, err := tp.makeAPI(ctx)
67
+ api, err := tp.makeAPI(t, ctx)
68
if err != nil {
69
t.Fatal(err)
70
}
@@ -105,7 +105,7 @@ func (tp *TestSuite) TestObjectPut(t *testing.T) {
105
func (tp *TestSuite) TestObjectGet(t *testing.T) {
106
ctx, cancel := context.WithCancel(context.Background())
107
defer cancel()
108
- api, err := tp.makeAPI(ctx)
108
+ api, err := tp.makeAPI(t, ctx)
109
if err != nil {
110
t.Fatal(err)
111
}
@@ -128,7 +128,7 @@ func (tp *TestSuite) TestObjectGet(t *testing.T) {
128
func (tp *TestSuite) TestObjectData(t *testing.T) {
129
ctx, cancel := context.WithCancel(context.Background())
130
defer cancel()
131
- api, err := tp.makeAPI(ctx)
131
+ api, err := tp.makeAPI(t, ctx)
132
if err != nil {
133
t.Fatal(err)
134
}
@@ -156,7 +156,7 @@ func (tp *TestSuite) TestObjectData(t *testing.T) {
156
func (tp *TestSuite) TestObjectLinks(t *testing.T) {
157
ctx, cancel := context.WithCancel(context.Background())
158
defer cancel()
159
- api, err := tp.makeAPI(ctx)
159
+ api, err := tp.makeAPI(t, ctx)
160
if err != nil {
161
t.Fatal(err)
162
}
@@ -192,7 +192,7 @@ func (tp *TestSuite) TestObjectLinks(t *testing.T) {
192
func (tp *TestSuite) TestObjectStat(t *testing.T) {
193
ctx, cancel := context.WithCancel(context.Background())
194
defer cancel()
195
- api, err := tp.makeAPI(ctx)
195
+ api, err := tp.makeAPI(t, ctx)
196
if err != nil {
197
t.Fatal(err)
198
}
@@ -240,7 +240,7 @@ func (tp *TestSuite) TestObjectStat(t *testing.T) {
240
func (tp *TestSuite) TestObjectAddLink(t *testing.T) {
241
ctx, cancel := context.WithCancel(context.Background())
242
defer cancel()
243
- api, err := tp.makeAPI(ctx)
243
+ api, err := tp.makeAPI(t, ctx)
244
if err != nil {
245
t.Fatal(err)
246
}
@@ -281,7 +281,7 @@ func (tp *TestSuite) TestObjectAddLink(t *testing.T) {
281
func (tp *TestSuite) TestObjectAddLinkCreate(t *testing.T) {
282
ctx, cancel := context.WithCancel(context.Background())
283
defer cancel()
284
- api, err := tp.makeAPI(ctx)
284
+ api, err := tp.makeAPI(t, ctx)
285
if err != nil {
286
t.Fatal(err)
287
}
@@ -330,7 +330,7 @@ func (tp *TestSuite) TestObjectAddLinkCreate(t *testing.T) {
330
func (tp *TestSuite) TestObjectRmLink(t *testing.T) {
331
ctx, cancel := context.WithCancel(context.Background())
332
defer cancel()
333
- api, err := tp.makeAPI(ctx)
333
+ api, err := tp.makeAPI(t, ctx)
334
if err != nil {
335
t.Fatal(err)
336
}
@@ -363,7 +363,7 @@ func (tp *TestSuite) TestObjectRmLink(t *testing.T) {
363
func (tp *TestSuite) TestObjectAddData(t *testing.T) {
364
ctx, cancel := context.WithCancel(context.Background())
365
defer cancel()
366
- api, err := tp.makeAPI(ctx)
366
+ api, err := tp.makeAPI(t, ctx)
367
if err != nil {
368
t.Fatal(err)
369
}
@@ -396,7 +396,7 @@ func (tp *TestSuite) TestObjectAddData(t *testing.T) {
396
func (tp *TestSuite) TestObjectSetData(t *testing.T) {
397
ctx, cancel := context.WithCancel(context.Background())
398
defer cancel()
399
- api, err := tp.makeAPI(ctx)
399
+ api, err := tp.makeAPI(t, ctx)
400
if err != nil {
401
t.Fatal(err)
402
}
@@ -429,7 +429,7 @@ func (tp *TestSuite) TestObjectSetData(t *testing.T) {
429
func (tp *TestSuite) TestDiffTest(t *testing.T) {
430
ctx, cancel := context.WithCancel(context.Background())
431
defer cancel()
432
- api, err := tp.makeAPI(ctx)
432
+ api, err := tp.makeAPI(t, ctx)
433
if err != nil {
434
t.Fatal(err)
435
}
core/coreiface/tests/path.go
+5
-5
@@ -25,7 +25,7 @@ func (tp *TestSuite) TestPath(t *testing.T) {
25
func (tp *TestSuite) TestMutablePath(t *testing.T) {
26
ctx, cancel := context.WithCancel(context.Background())
27
defer cancel()
28
- api, err := tp.makeAPI(ctx)
28
+ api, err := tp.makeAPI(t, ctx)
29
if err != nil {
30
t.Fatal(err)
31
}
@@ -58,7 +58,7 @@ func (tp *TestSuite) TestMutablePath(t *testing.T) {
58
func (tp *TestSuite) TestPathRemainder(t *testing.T) {
59
ctx, cancel := context.WithCancel(context.Background())
60
defer cancel()
61
- api, err := tp.makeAPI(ctx)
61
+ api, err := tp.makeAPI(t, ctx)
62
if err != nil {
63
t.Fatal(err)
64
}
@@ -89,7 +89,7 @@ func (tp *TestSuite) TestPathRemainder(t *testing.T) {
89
func (tp *TestSuite) TestEmptyPathRemainder(t *testing.T) {
90
ctx, cancel := context.WithCancel(context.Background())
91
defer cancel()
92
- api, err := tp.makeAPI(ctx)
92
+ api, err := tp.makeAPI(t, ctx)
93
if err != nil {
94
t.Fatal(err)
95
}
@@ -120,7 +120,7 @@ func (tp *TestSuite) TestEmptyPathRemainder(t *testing.T) {
120
func (tp *TestSuite) TestInvalidPathRemainder(t *testing.T) {
121
ctx, cancel := context.WithCancel(context.Background())
122
defer cancel()
123
- api, err := tp.makeAPI(ctx)
123
+ api, err := tp.makeAPI(t, ctx)
124
if err != nil {
125
t.Fatal(err)
126
}
@@ -147,7 +147,7 @@ func (tp *TestSuite) TestInvalidPathRemainder(t *testing.T) {
147
func (tp *TestSuite) TestPathRoot(t *testing.T) {
148
ctx, cancel := context.WithCancel(context.Background())
149
defer cancel()
150
- api, err := tp.makeAPI(ctx)
150
+ api, err := tp.makeAPI(t, ctx)
151
if err != nil {
152
t.Fatal(err)
153
}
core/coreiface/tests/pin.go
+8
-8
@@ -34,7 +34,7 @@ func (tp *TestSuite) TestPin(t *testing.T) {
34
func (tp *TestSuite) TestPinAdd(t *testing.T) {
35
ctx, cancel := context.WithCancel(context.Background())
36
defer cancel()
37
- api, err := tp.makeAPI(ctx)
37
+ api, err := tp.makeAPI(t, ctx)
38
if err != nil {
39
t.Fatal(err)
40
}
@@ -53,7 +53,7 @@ func (tp *TestSuite) TestPinAdd(t *testing.T) {
53
func (tp *TestSuite) TestPinSimple(t *testing.T) {
54
ctx, cancel := context.WithCancel(context.Background())
55
defer cancel()
56
- api, err := tp.makeAPI(ctx)
56
+ api, err := tp.makeAPI(t, ctx)
57
if err != nil {
58
t.Fatal(err)
59
}
@@ -105,7 +105,7 @@ func (tp *TestSuite) TestPinSimple(t *testing.T) {
105
func (tp *TestSuite) TestPinRecursive(t *testing.T) {
106
ctx, cancel := context.WithCancel(context.Background())
107
defer cancel()
108
- api, err := tp.makeAPI(ctx)
108
+ api, err := tp.makeAPI(t, ctx)
109
if err != nil {
110
t.Fatal(err)
111
}
@@ -249,7 +249,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
249
func (tp *TestSuite) TestPinLsIndirect(t *testing.T) {
250
ctx, cancel := context.WithCancel(context.Background())
251
defer cancel()
252
- api, err := tp.makeAPI(ctx)
252
+ api, err := tp.makeAPI(t, ctx)
253
if err != nil {
254
t.Fatal(err)
255
}
@@ -282,7 +282,7 @@ func (tp *TestSuite) TestPinLsPrecedence(t *testing.T) {
282
func (tp *TestSuite) TestPinLsPredenceRecursiveIndirect(t *testing.T) {
283
ctx, cancel := context.WithCancel(context.Background())
284
defer cancel()
285
- api, err := tp.makeAPI(ctx)
285
+ api, err := tp.makeAPI(t, ctx)
286
if err != nil {
287
t.Fatal(err)
288
}
@@ -306,7 +306,7 @@ func (tp *TestSuite) TestPinLsPredenceRecursiveIndirect(t *testing.T) {
306
func (tp *TestSuite) TestPinLsPrecedenceDirectIndirect(t *testing.T) {
307
ctx, cancel := context.WithCancel(context.Background())
308
defer cancel()
309
- api, err := tp.makeAPI(ctx)
309
+ api, err := tp.makeAPI(t, ctx)
310
if err != nil {
311
t.Fatal(err)
312
}
@@ -330,7 +330,7 @@ func (tp *TestSuite) TestPinLsPrecedenceDirectIndirect(t *testing.T) {
330
func (tp *TestSuite) TestPinLsPrecedenceRecursiveDirect(t *testing.T) {
331
ctx, cancel := context.WithCancel(context.Background())
332
defer cancel()
333
- api, err := tp.makeAPI(ctx)
333
+ api, err := tp.makeAPI(t, ctx)
334
if err != nil {
335
t.Fatal(err)
336
}
@@ -366,7 +366,7 @@ func (tp *TestSuite) TestPinLsPrecedenceRecursiveDirect(t *testing.T) {
366
func (tp *TestSuite) TestPinIsPinned(t *testing.T) {
367
ctx, cancel := context.WithCancel(context.Background())
368
defer cancel()
369
- api, err := tp.makeAPI(ctx)
369
+ api, err := tp.makeAPI(t, ctx)
370
if err != nil {
371
t.Fatal(err)
372
}
core/coreiface/tests/pubsub.go
+1
-1
@@ -24,7 +24,7 @@ func (tp *TestSuite) TestBasicPubSub(t *testing.T) {
24
ctx, cancel := context.WithCancel(context.Background())
25
defer cancel()
26
27
- apis, err := tp.MakeAPISwarm(ctx, 2)
27
+ apis, err := tp.MakeAPISwarm(t, ctx, 2)
28
if err != nil {
29
t.Fatal(err)
30
}
core/coreiface/tests/routing.go
+4
-4
@@ -43,7 +43,7 @@ func (tp *TestSuite) TestRoutingGet(t *testing.T) {
43
ctx, cancel := context.WithCancel(context.Background())
44
defer cancel()
45
46
- apis, err := tp.MakeAPISwarm(ctx, 2)
46
+ apis, err := tp.MakeAPISwarm(t, ctx, 2)
47
if err != nil {
48
t.Fatal(err)
49
}
@@ -72,7 +72,7 @@ func (tp *TestSuite) TestRoutingGet(t *testing.T) {
72
func (tp *TestSuite) TestRoutingPut(t *testing.T) {
73
ctx, cancel := context.WithCancel(context.Background())
74
defer cancel()
75
- apis, err := tp.MakeAPISwarm(ctx, 2)
75
+ apis, err := tp.MakeAPISwarm(t, ctx, 2)
76
if err != nil {
77
t.Fatal(err)
78
}
@@ -98,7 +98,7 @@ func (tp *TestSuite) TestRoutingPutOffline(t *testing.T) {
98
defer cancel()
99
100
// init a swarm & publish an IPNS entry to get a valid payload
101
- apis, err := tp.MakeAPISwarm(ctx, 2)
101
+ apis, err := tp.MakeAPISwarm(t, ctx, 2)
102
if err != nil {
103
t.Fatal(err)
104
}
@@ -110,7 +110,7 @@ func (tp *TestSuite) TestRoutingPutOffline(t *testing.T) {
110
}
111
112
// init our offline node and try to put the payload
113
- api, err := tp.makeAPIWithIdentityAndOffline(ctx)
113
+ api, err := tp.makeAPIWithIdentityAndOffline(t, ctx)
114
if err != nil {
115
t.Fatal(err)
116
}
core/coreiface/tests/unixfs.go
+13
-13
@@ -99,7 +99,7 @@ func wrapped(names ...string) func(f files.Node) files.Node {
99
func (tp *TestSuite) TestAdd(t *testing.T) {
100
ctx, cancel := context.WithCancel(context.Background())
101
defer cancel()
102
- api, err := tp.makeAPI(ctx)
102
+ api, err := tp.makeAPI(t, ctx)
103
if err != nil {
104
t.Fatal(err)
105
}
@@ -533,7 +533,7 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
533
func (tp *TestSuite) TestAddPinned(t *testing.T) {
534
ctx, cancel := context.WithCancel(context.Background())
535
defer cancel()
536
- api, err := tp.makeAPI(ctx)
536
+ api, err := tp.makeAPI(t, ctx)
537
if err != nil {
538
t.Fatal(err)
539
}
@@ -559,7 +559,7 @@ func (tp *TestSuite) TestAddPinned(t *testing.T) {
559
func (tp *TestSuite) TestAddHashOnly(t *testing.T) {
560
ctx, cancel := context.WithCancel(context.Background())
561
defer cancel()
562
- api, err := tp.makeAPI(ctx)
562
+ api, err := tp.makeAPI(t, ctx)
563
if err != nil {
564
t.Fatal(err)
565
}
@@ -585,7 +585,7 @@ func (tp *TestSuite) TestAddHashOnly(t *testing.T) {
585
func (tp *TestSuite) TestGetEmptyFile(t *testing.T) {
586
ctx, cancel := context.WithCancel(context.Background())
587
defer cancel()
588
- api, err := tp.makeAPI(ctx)
588
+ api, err := tp.makeAPI(t, ctx)
589
if err != nil {
590
t.Fatal(err)
591
}
@@ -615,7 +615,7 @@ func (tp *TestSuite) TestGetEmptyFile(t *testing.T) {
615
func (tp *TestSuite) TestGetDir(t *testing.T) {
616
ctx, cancel := context.WithCancel(context.Background())
617
defer cancel()
618
- api, err := tp.makeAPI(ctx)
618
+ api, err := tp.makeAPI(t, ctx)
619
if err != nil {
620
t.Fatal(err)
621
}
@@ -648,7 +648,7 @@ func (tp *TestSuite) TestGetDir(t *testing.T) {
648
func (tp *TestSuite) TestGetNonUnixfs(t *testing.T) {
649
ctx, cancel := context.WithCancel(context.Background())
650
defer cancel()
651
- api, err := tp.makeAPI(ctx)
651
+ api, err := tp.makeAPI(t, ctx)
652
if err != nil {
653
t.Fatal(err)
654
}
@@ -668,7 +668,7 @@ func (tp *TestSuite) TestGetNonUnixfs(t *testing.T) {
668
func (tp *TestSuite) TestLs(t *testing.T) {
669
ctx, cancel := context.WithCancel(context.Background())
670
defer cancel()
671
- api, err := tp.makeAPI(ctx)
671
+ api, err := tp.makeAPI(t, ctx)
672
if err != nil {
673
t.Fatal(err)
674
}
@@ -728,7 +728,7 @@ func (tp *TestSuite) TestLs(t *testing.T) {
728
func (tp *TestSuite) TestEntriesExpired(t *testing.T) {
729
ctx, cancel := context.WithCancel(context.Background())
730
defer cancel()
731
- api, err := tp.makeAPI(ctx)
731
+ api, err := tp.makeAPI(t, ctx)
732
if err != nil {
733
t.Fatal(err)
734
}
@@ -770,7 +770,7 @@ func (tp *TestSuite) TestEntriesExpired(t *testing.T) {
770
func (tp *TestSuite) TestLsEmptyDir(t *testing.T) {
771
ctx, cancel := context.WithCancel(context.Background())
772
defer cancel()
773
- api, err := tp.makeAPI(ctx)
773
+ api, err := tp.makeAPI(t, ctx)
774
if err != nil {
775
t.Fatal(err)
776
}
@@ -799,7 +799,7 @@ func (tp *TestSuite) TestLsEmptyDir(t *testing.T) {
799
func (tp *TestSuite) TestLsNonUnixfs(t *testing.T) {
800
ctx, cancel := context.WithCancel(context.Background())
801
defer cancel()
802
- api, err := tp.makeAPI(ctx)
802
+ api, err := tp.makeAPI(t, ctx)
803
if err != nil {
804
t.Fatal(err)
805
}
@@ -858,7 +858,7 @@ func (f *closeTestF) Close() error {
858
func (tp *TestSuite) TestAddCloses(t *testing.T) {
859
ctx, cancel := context.WithCancel(context.Background())
860
defer cancel()
861
- api, err := tp.makeAPI(ctx)
861
+ api, err := tp.makeAPI(t, ctx)
862
if err != nil {
863
t.Fatal(err)
864
}
@@ -896,7 +896,7 @@ func (tp *TestSuite) TestAddCloses(t *testing.T) {
896
func (tp *TestSuite) TestGetSeek(t *testing.T) {
897
ctx, cancel := context.WithCancel(context.Background())
898
defer cancel()
899
- api, err := tp.makeAPI(ctx)
899
+ api, err := tp.makeAPI(t, ctx)
900
if err != nil {
901
t.Fatal(err)
902
}
@@ -1002,7 +1002,7 @@ func (tp *TestSuite) TestGetSeek(t *testing.T) {
1002
func (tp *TestSuite) TestGetReadAt(t *testing.T) {
1003
ctx, cancel := context.WithCancel(context.Background())
1004
defer cancel()
1005
- api, err := tp.makeAPI(ctx)
1005
+ api, err := tp.makeAPI(t, ctx)
1006
if err != nil {
1007
t.Fatal(err)
1008
}