Refactor integration tests to be a little cleaner and more stable, I hope

test/reset_test.go

@@ -13,7 +13,6 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
-	"time"
 )
 
 func TestReset(t *testing.T) {
@@ -41,13 +40,13 @@ func TestReset(t *testing.T) {
 	// startup, UPnP etc complete and make sure that we've performed folder
 	// error checking which creates the folder path if it's missing.
 	log.Println("Starting...")
-	waitForScan(t, &p)
+	waitForScan(p)
 
 	log.Println("Creating files...")
 	size := createFiles(t)
 
 	log.Println("Scanning files...")
-	waitForScan(t, &p)
+	waitForScan(p)
 
 	m, err := p.model("default")
 	if err != nil {
@@ -90,7 +89,7 @@ func TestReset(t *testing.T) {
 
 	// Wait for ST and scan
 	p.start()
-	waitForScan(t, &p)
+	waitForScan(p)
 
 	// Verify that we see them
 	m, err = p.model("default")
@@ -105,7 +104,7 @@ func TestReset(t *testing.T) {
 	// Recreate the files and scan
 	log.Println("Creating files...")
 	size = createFiles(t)
-	waitForScan(t, &p)
+	waitForScan(p)
 
 	// Verify that we see them
 	m, err = p.model("default")
@@ -126,7 +125,7 @@ func TestReset(t *testing.T) {
 
 	// Wait for ST and scan
 	p.start()
-	waitForScan(t, &p)
+	waitForScan(p)
 
 	m, err = p.model("default")
 	if err != nil {
@@ -138,18 +137,6 @@ func TestReset(t *testing.T) {
 	}
 }
 
-func waitForScan(t *testing.T, p *syncthingProcess) {
-	// Wait for one scan to succeed, or up to 20 seconds...
-	for i := 0; i < 20; i++ {
-		err := p.rescan("default")
-		if err != nil {
-			time.Sleep(time.Second)
-			continue
-		}
-		break
-	}
-}
-
 func createFiles(t *testing.T) int {
 	// Create eight empty files and directories
 	files := []string{"f1", "f2", "f3", "f4", "f11", "f12", "f13", "f14"}