cotugno/syncthing
2
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2024-11-16 18:41:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make sure to stop processes when exiting integration test

Browse Source
This commit is contained in:
Jakob Borg 2014-12-30 16:04:34 +01:00
parent 1e9110b763
commit a7694029e2
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/sync_test.go
View File

@ -132,11 +132,6 @@ func testSyncCluster(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
p, err := scStartProcesses()
if err != nil {
t.Fatal(err)
}
// Prepare the expected state of folders after the sync // Prepare the expected state of folders after the sync
c1, err := directoryContents("s1") c1, err := directoryContents("s1")
if err != nil { if err != nil {
@ -161,6 +156,17 @@ func testSyncCluster(t *testing.T) {
} }
expected := [][]fileInfo{e1, e2, e3} 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++ { for count := 0; count < 5; count++ {
log.Println("Forcing rescan...") log.Println("Forcing rescan...")
@ -242,10 +248,6 @@ func testSyncCluster(t *testing.T) {
} }
expected = [][]fileInfo{e1, e2, e3} expected = [][]fileInfo{e1, e2, e3}
} }
for i := range p {
p[i].stop()
}
} }
func scStartProcesses() ([]syncthingProcess, error) { func scStartProcesses() ([]syncthingProcess, error) {