Refactored integration tests

Added internal/rc to remote control a Syncthing process and made the
"awaiting sync" determination reliable.

test/reset_test.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
+	"time"
 )
 
 func TestReset(t *testing.T) {
@@ -23,32 +24,17 @@ func TestReset(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	p := syncthingProcess{ // id1
-		instance: "1",
-		argv:     []string{"-home", "h1"},
-		port:     8081,
-		apiKey:   apiKey,
-	}
-	err = p.start()
-	if err != nil {
+	if err := os.Mkdir("s1", 0755); err != nil {
 		t.Fatal(err)
 	}
-	defer p.stop()
-
-	// Wait for one scan to succeed, or up to 20 seconds... This is to let
-	// 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(p)
 
 	log.Println("Creating files...")
 	size := createFiles(t)
 
-	log.Println("Scanning files...")
-	waitForScan(p)
+	p := startInstance(t, 1)
+	defer checkedStop(t, p)
 
-	m, err := p.model("default")
+	m, err := p.Model("default")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -59,40 +45,41 @@ func TestReset(t *testing.T) {
 
 	// Clear all files but restore the folder marker
 	log.Println("Cleaning...")
-	err = removeAll("s1/*", "h1/index*")
+	err = removeAll("s1")
 	if err != nil {
 		t.Fatal(err)
 	}
-	os.Create("s1/.stfolder")
+	if err := os.Mkdir("s1", 0755); err != nil {
+		t.Fatal(err)
+	}
+	if fd, err := os.Create("s1/.stfolder"); err != nil {
+		t.Fatal(err)
+	} else {
+		fd.Close()
+	}
 
 	// Reset indexes of an invalid folder
 	log.Println("Reset invalid folder")
-	err = p.reset("invalid")
+	_, err = p.Post("/rest/system/reset?folder=invalid", nil)
 	if err == nil {
 		t.Fatalf("Cannot reset indexes of an invalid folder")
 	}
-	m, err = p.model("default")
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected = size
-	if m.LocalFiles != expected {
-		t.Fatalf("Incorrect number of files after initial scan, %d != %d", m.LocalFiles, expected)
-	}
 
 	// Reset indexes of the default folder
 	log.Println("Reset indexes of default folder")
-	err = p.reset("default")
+	_, err = p.Post("/rest/system/reset?folder=default", nil)
 	if err != nil {
 		t.Fatal("Failed to reset indexes of the default folder:", err)
 	}
 
-	// Wait for ST and scan
-	p.start()
-	waitForScan(p)
+	// Syncthing restarts on reset. But we set STNORESTART=1 for the tests. So
+	// we wait for it to exit, then do a stop so the rc.Process is happy and
+	// restart it again.
+	time.Sleep(time.Second)
+	checkedStop(t, p)
+	p = startInstance(t, 1)
 
-	// Verify that we see them
-	m, err = p.model("default")
+	m, err = p.Model("default")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -104,10 +91,13 @@ func TestReset(t *testing.T) {
 	// Recreate the files and scan
 	log.Println("Creating files...")
 	size = createFiles(t)
-	waitForScan(p)
+
+	if err := p.Rescan("default"); err != nil {
+		t.Fatal(err)
+	}
 
 	// Verify that we see them
-	m, err = p.model("default")
+	m, err = p.Model("default")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -118,16 +108,21 @@ func TestReset(t *testing.T) {
 
 	// Reset all indexes
 	log.Println("Reset DB...")
-	err = p.reset("")
+	_, err = p.Post("/rest/system/reset?folder=default", nil)
 	if err != nil {
 		t.Fatalf("Failed to reset indexes", err)
 	}
 
-	// Wait for ST and scan
-	p.start()
-	waitForScan(p)
+	// Syncthing restarts on reset. But we set STNORESTART=1 for the tests. So
+	// we wait for it to exit, then do a stop so the rc.Process is happy and
+	// restart it again.
+	time.Sleep(time.Second)
+	checkedStop(t, p)
 
-	m, err = p.model("default")
+	p = startInstance(t, 1)
+	defer checkedStop(t, p)
+
+	m, err = p.Model("default")
 	if err != nil {
 		t.Fatal(err)
 	}