Fix sync benchmark for latest test changes
This commit is contained in:
parent
3b3aa94c4e
commit
8b66472949
|
@ -35,14 +35,17 @@ func TestBenchmarkTransfer(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
expected := directoryContents("s1")
|
expected, err := directoryContents("s1")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
log.Println("Starting sender...")
|
log.Println("Starting sender...")
|
||||||
sender := syncthingProcess{ // id1
|
sender := syncthingProcess{ // id1
|
||||||
log: "1.out",
|
instance: "1",
|
||||||
argv: []string{"-home", "h1"},
|
argv: []string{"-home", "h1"},
|
||||||
port: 8081,
|
port: 8081,
|
||||||
apiKey: apiKey,
|
apiKey: apiKey,
|
||||||
}
|
}
|
||||||
err = sender.start()
|
err = sender.start()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -54,10 +57,10 @@ func TestBenchmarkTransfer(t *testing.T) {
|
||||||
|
|
||||||
log.Println("Starting receiver...")
|
log.Println("Starting receiver...")
|
||||||
receiver := syncthingProcess{ // id2
|
receiver := syncthingProcess{ // id2
|
||||||
log: "2.out",
|
instance: "2",
|
||||||
argv: []string{"-home", "h2"},
|
argv: []string{"-home", "h2"},
|
||||||
port: 8082,
|
port: 8082,
|
||||||
apiKey: apiKey,
|
apiKey: apiKey,
|
||||||
}
|
}
|
||||||
err = receiver.start()
|
err = receiver.start()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -104,7 +107,10 @@ loop:
|
||||||
|
|
||||||
log.Println("Verifying...")
|
log.Println("Verifying...")
|
||||||
|
|
||||||
actual := directoryContents("s2")
|
actual, err := directoryContents("s2")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
err = compareDirectoryContents(actual, expected)
|
err = compareDirectoryContents(actual, expected)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|
Loading…
Reference in New Issue