From a7694029e26c02ee8d2bffea97de4b5a220697f5 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Tue, 30 Dec 2014 16:04:34 +0100
Subject: [PATCH] Make sure to stop processes when exiting integration test

---
 test/sync_test.go | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/test/sync_test.go b/test/sync_test.go
index 8672806be..759941a10 100644
--- a/test/sync_test.go
+++ b/test/sync_test.go
@@ -132,11 +132,6 @@ func testSyncCluster(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p, err := scStartProcesses()
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// Prepare the expected state of folders after the sync
 	c1, err := directoryContents("s1")
 	if err != nil {
@@ -161,6 +156,17 @@ func testSyncCluster(t *testing.T) {
 	}
 	expected := [][]fileInfo{e1, e2, e3}
 
+	// Start the syncers
+	p, err := scStartProcesses()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		for i := range p {
+			p[i].stop()
+		}
+	}()
+
 	for count := 0; count < 5; count++ {
 		log.Println("Forcing rescan...")
 
@@ -242,10 +248,6 @@ func testSyncCluster(t *testing.T) {
 		}
 		expected = [][]fileInfo{e1, e2, e3}
 	}
-
-	for i := range p {
-		p[i].stop()
-	}
 }
 
 func scStartProcesses() ([]syncthingProcess, error) {