Tweak locking and integration test.

integration/genfiles.go

@@ -18,17 +18,22 @@ func name() string {
 
 func main() {
 	var files int
-	var maxsize int
+	var maxexp int
 
 	flag.IntVar(&files, "files", 1000, "Number of files")
-	flag.IntVar(&maxsize, "maxsize", 1000, "Maximum file size (KB)")
+	flag.IntVar(&maxexp, "maxexp", 20, "Maximum file size (max = 2^n + 128*1024 B)")
 	flag.Parse()
 
 	for i := 0; i < files; i++ {
 		n := name()
 		p0 := path.Join(string(n[0]), n[0:2])
 		os.MkdirAll(p0, 0755)
-		s := mr.Intn(maxsize * 1024)
+		s := 1 << uint(mr.Intn(maxexp))
+		a := 128 * 1024
+		if a > s {
+			a = s
+		}
+		s += mr.Intn(a)
 		b := make([]byte, s)
 		rand.Reader.Read(b)
 		p1 := path.Join(p0, n)

integration/test.sh

@@ -2,6 +2,7 @@
 
 rm -rf files-* conf-* md5-*
 
+extraopts=""
 p=$(pwd)
 
 go build genfiles.go
@@ -29,19 +30,22 @@ EOT
 
 	mkdir files-$i
 	pushd files-$i >/dev/null
-	../genfiles -maxsize 780 -files 1500
+	../genfiles -maxexp 21 -files 4000
 	../md5r > ../md5-$i
 	popd >/dev/null
 done
 
 echo "Starting..."
 for i in 1 2 3 ; do
-	syncthing -c conf-$i --no-gui -l :2200$i &
+	sleep 1
+	syncthing -c conf-$i --no-gui -l :2200$i $extraopts &
 done
 
 cat md5-* | sort > md5-tot
 while true ; do
-	sleep 10
+	read
+	echo Verifying...
+
 	conv=0
 	for i in 1 2 3 ; do
 		pushd files-$i >/dev/null