@cryptotaxi247 / kubo / commits / 4d8c4439c

improve basic bitswap test

License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>

Steven Allen committed Dec 15, 2017 at 13:06 UTC 4d8c4439c2def7d4456ff1003227c5ceaf1db1d5
1 file changed +16 -9
exchange/bitswap/bitswap_test.go
+16 -9
@@ -292,23 +292,22 @@ func TestEmptyKey(t *testing.T) {
292 }
293 }
294
295 -func assertStat(st *Stat, sblks, rblks, sdata, rdata uint64) error {
295 +func assertStat(t *testing.T, st *Stat, sblks, rblks, sdata, rdata uint64) {
296 if sblks != st.BlocksSent {
297 - return fmt.Errorf("mismatch in blocks sent: %d vs %d", sblks, st.BlocksSent)
297 + t.Errorf("mismatch in blocks sent: %d vs %d", sblks, st.BlocksSent)
298 }
299
300 if rblks != st.BlocksReceived {
301 - return fmt.Errorf("mismatch in blocks recvd: %d vs %d", rblks, st.BlocksReceived)
301 + t.Errorf("mismatch in blocks recvd: %d vs %d", rblks, st.BlocksReceived)
302 }
303
304 if sdata != st.DataSent {
305 - return fmt.Errorf("mismatch in data sent: %d vs %d", sdata, st.DataSent)
305 + t.Errorf("mismatch in data sent: %d vs %d", sdata, st.DataSent)
306 }
307
308 if rdata != st.DataReceived {
309 - return fmt.Errorf("mismatch in data recvd: %d vs %d", rdata, st.DataReceived)
309 + t.Errorf("mismatch in data recvd: %d vs %d", rdata, st.DataReceived)
310 }
311 - return nil
311 }
312
313 func TestBasicBitswap(t *testing.T) {
@@ -355,12 +354,20 @@ func TestBasicBitswap(t *testing.T) {
354 t.Fatal(err)
355 }
356
358 - if err := assertStat(st0, 1, 0, 1, 0); err != nil {
357 + st2, err := instances[2].Exchange.Stat()
358 + if err != nil {
359 t.Fatal(err)
360 }
361
362 - if err := assertStat(st1, 0, 1, 0, 1); err != nil {
363 - t.Fatal(err)
362 + t.Log("stat node 0")
363 + assertStat(t, st0, 1, 0, uint64(len(blk.RawData())), 0)
364 + t.Log("stat node 1")
365 + assertStat(t, st1, 0, 1, 0, uint64(len(blk.RawData())))
366 + t.Log("stat node 2")
367 + assertStat(t, st2, 0, 0, 0, 0)
368 +
369 + if !bytes.Equal(blk.RawData(), blocks[0].RawData()) {
370 + t.Errorf("blocks aren't equal: expected %v, actual %v", blocks[0].RawData(), blk.RawData())
371 }
372
373 t.Log(blk)