test, lib/model: Various integration test updates & improvements (#6956)

test/reconnect_test.go

@@ -12,6 +12,8 @@ import (
 	"log"
 	"testing"
 	"time"
+
+	"github.com/syncthing/syncthing/lib/rc"
 )
 
 func TestReconnectReceiverDuringTransfer(t *testing.T) {
@@ -45,7 +47,7 @@ func testReconnectDuringTransfer(t *testing.T, restartSender, restartReceiver bo
 
 	receiver := startInstance(t, 2)
 	defer func() {
-		// We need a receiver over sender, since we'll update it later to
+		// We need a closure over sender, since we'll update it later to
 		// point at another process.
 		checkedStop(t, receiver)
 	}()
@@ -72,7 +74,7 @@ func testReconnectDuringTransfer(t *testing.T, restartSender, restartReceiver bo
 			t.Fatal(err)
 		}
 
-		if recv.InSyncBytes > 0 && recv.InSyncBytes == recv.GlobalBytes {
+		if recv.InSyncBytes > 0 && recv.InSyncBytes == recv.GlobalBytes && rc.InSync("default", receiver, sender) {
 			// Receiver is done
 			break
 		} else if recv.InSyncBytes > prevBytes+recv.GlobalBytes/10 {
@@ -115,6 +117,10 @@ func testReconnectDuringTransfer(t *testing.T, restartSender, restartReceiver bo
 	log.Println("Comparing directories...")
 	err = compareDirectories("s1", "s2")
 	if err != nil {
-		t.Fatal(err)
+		t.Error(err)
+	}
+
+	if err := checkRemoteInSync("default", receiver, sender); err != nil {
+		t.Error(err)
 	}
 }