Run integration tests with -race (fixes #1043)

This commit is contained in:
Jakob Borg
2014-11-29 22:17:54 +01:00
parent 7af25c785d
commit 4fdecc9b85
7 changed files with 112 additions and 41 deletions

View File

@@ -73,7 +73,7 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
}
err = receiver.start()
if err != nil {
sender.stop()
_ = sender.stop()
t.Fatal(err)
}
@@ -85,28 +85,40 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
time.Sleep(250 * time.Millisecond)
continue
}
sender.stop()
receiver.stop()
_ = sender.stop()
_ = receiver.stop()
t.Fatal(err)
}
curComp := comp[id2]
if curComp == 100 {
sender.stop()
receiver.stop()
err = sender.stop()
if err != nil {
t.Fatal(err)
}
err = receiver.stop()
if err != nil {
t.Fatal(err)
}
break
}
if curComp > prevComp {
if restartReceiver {
log.Printf("Stopping receiver...")
receiver.stop()
err = receiver.stop()
if err != nil {
t.Fatal(err)
}
}
if restartSender {
log.Printf("Stopping sender...")
sender.stop()
err = sender.stop()
if err != nil {
t.Fatal(err)
}
}
var wg sync.WaitGroup
@@ -139,8 +151,14 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
time.Sleep(250 * time.Millisecond)
}
sender.stop()
receiver.stop()
err = sender.stop()
if err != nil {
t.Fatal(err)
}
err = receiver.stop()
if err != nil {
t.Fatal(err)
}
log.Println("Comparing directories...")
err = compareDirectories("s1", "s2")