improve cleaning up in dht tests.
Jeromy committed
Sep 15, 2014 at 20:45 UTC
b5a1b1c658c5bbf20d46556c91b2670363610b0b
1 file changed
+19
-14
routing/dht/dht_test.go
+19
-14
@@ -107,6 +107,8 @@ func TestPing(t *testing.T) {
107
108
dhtA.Start()
109
dhtB.Start()
110
+ defer dhtA.Halt()
111
+ defer dhtB.Halt()
112
113
_, err = dhtA.Connect(addrB)
114
if err != nil {
@@ -118,9 +120,6 @@ func TestPing(t *testing.T) {
120
if err != nil {
121
t.Fatal(err)
122
}
121
-
122
- dhtA.Halt()
123
- dhtB.Halt()
123
}
124
125
func TestValueGetSet(t *testing.T) {
@@ -153,6 +152,8 @@ func TestValueGetSet(t *testing.T) {
152
153
dhtA.Start()
154
dhtB.Start()
155
+ defer dhtA.Halt()
156
+ defer dhtB.Halt()
157
158
errsa := dhtA.network.GetErrChan()
159
errsb := dhtB.network.GetErrChan()
@@ -187,6 +188,11 @@ func TestProvides(t *testing.T) {
188
u.Debug = false
189
190
addrs, _, dhts := setupDHTS(4, t)
191
+ defer func() {
192
+ for i := 0; i < 4; i++ {
193
+ dhts[i].Halt()
194
+ }
195
+ }()
196
197
_, err := dhts[0].Connect(addrs[1])
198
if err != nil {
@@ -228,15 +234,16 @@ func TestProvides(t *testing.T) {
234
if len(provs) != 1 {
235
t.Fatal("Didnt get back providers")
236
}
231
-
232
- for i := 0; i < 4; i++ {
233
- dhts[i].Halt()
234
- }
237
}
238
239
func TestLayeredGet(t *testing.T) {
240
u.Debug = false
241
addrs, _, dhts := setupDHTS(4, t)
242
+ defer func() {
243
+ for i := 0; i < 4; i++ {
244
+ dhts[i].Halt()
245
+ }
246
+ }()
247
248
_, err := dhts[0].Connect(addrs[1])
249
if err != nil {
@@ -274,15 +281,17 @@ func TestLayeredGet(t *testing.T) {
281
t.Fatal("Got incorrect value.")
282
}
283
277
- for i := 0; i < 4; i++ {
278
- dhts[i].Halt()
279
- }
284
}
285
286
func TestFindPeer(t *testing.T) {
287
u.Debug = false
288
289
addrs, peers, dhts := setupDHTS(4, t)
290
+ go func() {
291
+ for i := 0; i < 4; i++ {
292
+ dhts[i].Halt()
293
+ }
294
+ }()
295
296
_, err := dhts[0].Connect(addrs[1])
297
if err != nil {
@@ -311,8 +320,4 @@ func TestFindPeer(t *testing.T) {
320
if !p.ID.Equal(peers[2].ID) {
321
t.Fatal("Didnt find expected peer.")
322
}
314
-
315
- for i := 0; i < 4; i++ {
316
- dhts[i].Halt()
317
- }
323
}