Merge pull request #1246 from stevvooe/decrease-driver-testsuite-allocations

storage/driver: decrease memory allocation done during testsuite

registry/storage/driver/testsuites/testsuites.go

@@ -1135,12 +1135,19 @@ func randomFilename(length int64) string {
 	return string(b)
 }
 
-func randomContents(length int64) []byte {
+// randomBytes pre-allocates all of the memory sizes needed for the test. If
-	b := make([]byte, length)
+// anything panics while accessing randomBytes, just make this number bigger.
-	for i := range b {
+var randomBytes = make([]byte, 96<<20)
-		b[i] = byte(rand.Intn(2 << 8))
+
+func init() {
+	// increase the random bytes to the required maximum
+	for i := range randomBytes {
+		randomBytes[i] = byte(rand.Intn(2 << 8))
 	}
-	return b
+}
+
+func randomContents(length int64) []byte {
+	return randomBytes[:length]
 }
 
 type randReader struct {
@@ -1151,14 +1158,14 @@ type randReader struct {
 func (rr *randReader) Read(p []byte) (n int, err error) {
 	rr.m.Lock()
 	defer rr.m.Unlock()
-	for i := 0; i < len(p) && rr.r > 0; i++ {
+
-		p[i] = byte(rand.Intn(255))
+	n = copy(p, randomContents(int64(len(p))))
-		n++
+	rr.r -= int64(n)
-		rr.r--
+
-	}
+	if rr.r <= 0 {
-	if rr.r == 0 {
 		err = io.EOF
 	}
+
 	return
 }