Merge pull request #23 from ipfs/fix/ci

test: avoid fuzzing while the race detector is enabled

.circleci/config.yml

+version: 2.1
+orbs:
+  ci-go: ipfs/ci-go@0.2
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - ci-go/build
+      - ci-go/lint
+      - ci-go/test
+      - ci-go/test:
+          race: true
+          name: "ci-go/test/race"

.travis.yml

-os:
-  - linux
-
-language: go
-
-go:
-  - 1.11.x
-
-env:
-  global:
-    - GOTFLAGS="-race"
-    - BUILD_DEPTYPE=gomod
-
-# disable travis install
-install:
-  - true
-
-script:
-  - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh)
-
-
-cache:
-  directories:
-    - $GOPATH/pkg/mod
-    - $HOME/.cache/go-build
-
-notifications:
-  email: false

buzhash_norace_test.go

+//+build !race
+
+package chunk
+
+import (
+	"testing"
+)
+
+func TestFuzzBuzhashChunking(t *testing.T) {
+	buf := make([]byte, 1024*1024*16)
+	for i := 0; i < 100; i++ {
+		testBuzhashChunking(t, buf)
+	}
+}

buzhash_test.go

@@ -8,50 +8,56 @@ import (
 	util "github.com/ipfs/go-ipfs-util"
 )
 
-func TestBuzhashChunking(t *testing.T) {
-	data := make([]byte, 1024*1024*16)
-
-	chunkCount := 0
-	rounds := 100
-
-	for i := 0; i < rounds; i++ {
-		util.NewTimeSeededRand().Read(data)
+func testBuzhashChunking(t *testing.T, buf []byte) (chunkCount int) {
+	n, err := util.NewTimeSeededRand().Read(buf)
+	if n < len(buf) {
+		t.Fatalf("expected %d bytes, got %d", len(buf), n)
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
 
-		r := NewBuzhash(bytes.NewReader(data))
+	r := NewBuzhash(bytes.NewReader(buf))
 
-		var chunks [][]byte
+	var chunks [][]byte
 
-		for {
-			chunk, err := r.NextBytes()
-			if err != nil {
-				if err == io.EOF {
-					break
-				}
-				t.Fatal(err)
+	for {
+		chunk, err := r.NextBytes()
+		if err != nil {
+			if err == io.EOF {
+				break
 			}
-
-			chunks = append(chunks, chunk)
+			t.Fatal(err)
 		}
-		chunkCount += len(chunks)
 
-		for i, chunk := range chunks {
-			if len(chunk) == 0 {
-				t.Fatalf("chunk %d/%d is empty", i+1, len(chunks))
-			}
-		}
+		chunks = append(chunks, chunk)
+	}
+	chunkCount += len(chunks)
 
-		for i, chunk := range chunks[:len(chunks)-1] {
-			if len(chunk) < buzMin {
-				t.Fatalf("chunk %d/%d is less than the minimum size", i+1, len(chunks))
-			}
+	for i, chunk := range chunks {
+		if len(chunk) == 0 {
+			t.Fatalf("chunk %d/%d is empty", i+1, len(chunks))
 		}
+	}
 
-		unchunked := bytes.Join(chunks, nil)
-		if !bytes.Equal(unchunked, data) {
-			t.Fatal("data was chunked incorrectly")
+	for i, chunk := range chunks[:len(chunks)-1] {
+		if len(chunk) < buzMin {
+			t.Fatalf("chunk %d/%d is less than the minimum size", i+1, len(chunks))
 		}
 	}
-	t.Logf("average block size: %d\n", len(data)*rounds/chunkCount)
+
+	unchunked := bytes.Join(chunks, nil)
+	if !bytes.Equal(unchunked, buf) {
+		t.Fatal("data was chunked incorrectly")
+	}
+
+	return chunkCount
+}
+
+func TestBuzhashChunking(t *testing.T) {
+	buf := make([]byte, 1024*1024*16)
+	count := testBuzhashChunking(t, buf)
+	t.Logf("average block size: %d\n", len(buf)/count)
 }
 
 func TestBuzhashChunkReuse(t *testing.T) {

rabin_test.go

@@ -12,7 +12,13 @@ import (
 
 func TestRabinChunking(t *testing.T) {
 	data := make([]byte, 1024*1024*16)
-	util.NewTimeSeededRand().Read(data)
+	n, err := util.NewTimeSeededRand().Read(data)
+	if n < len(data) {
+		t.Fatalf("expected %d bytes, got %d", len(data), n)
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	r := NewRabin(bytes.NewReader(data), 1024*256)
 
@@ -62,7 +68,13 @@ func chunkData(t *testing.T, newC newSplitter, data []byte) map[string]blocks.Bl
 
 func testReuse(t *testing.T, cr newSplitter) {
 	data := make([]byte, 1024*1024*16)
-	util.NewTimeSeededRand().Read(data)
+	n, err := util.NewTimeSeededRand().Read(data)
+	if n < len(data) {
+		t.Fatalf("expected %d bytes, got %d", len(data), n)
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	ch1 := chunkData(t, cr, data[1000:])
 	ch2 := chunkData(t, cr, data)