From 8b66472949d576459e06168156ac23885d30e1d2 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Thu, 19 Feb 2015 13:15:51 +0200
Subject: [PATCH] Fix sync benchmark for latest test changes

---
 test/transfer-bench_test.go | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/test/transfer-bench_test.go b/test/transfer-bench_test.go
index e338e3ac..b9e802cd 100644
--- a/test/transfer-bench_test.go
+++ b/test/transfer-bench_test.go
@@ -35,14 +35,17 @@ func TestBenchmarkTransfer(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	expected := directoryContents("s1")
+	expected, err := directoryContents("s1")
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	log.Println("Starting sender...")
 	sender := syncthingProcess{ // id1
-		log:    "1.out",
-		argv:   []string{"-home", "h1"},
-		port:   8081,
-		apiKey: apiKey,
+		instance: "1",
+		argv:     []string{"-home", "h1"},
+		port:     8081,
+		apiKey:   apiKey,
 	}
 	err = sender.start()
 	if err != nil {
@@ -54,10 +57,10 @@ func TestBenchmarkTransfer(t *testing.T) {
 
 	log.Println("Starting receiver...")
 	receiver := syncthingProcess{ // id2
-		log:    "2.out",
-		argv:   []string{"-home", "h2"},
-		port:   8082,
-		apiKey: apiKey,
+		instance: "2",
+		argv:     []string{"-home", "h2"},
+		port:     8082,
+		apiKey:   apiKey,
 	}
 	err = receiver.start()
 	if err != nil {
@@ -104,7 +107,10 @@ loop:
 
 	log.Println("Verifying...")
 
-	actual := directoryContents("s2")
+	actual, err := directoryContents("s2")
+	if err != nil {
+		t.Fatal(err)
+	}
 	err = compareDirectoryContents(actual, expected)
 	if err != nil {
 		t.Fatal(err)