perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix reset DB

Browse Source 
The reset of all folders failed when there was no data for a given
folder, as it was not returned by db.ListFolders then. But we don't
really care about that, we can "reset" it anyway...
This commit is contained in:
Jakob Borg
2015-06-21 09:35:41 +02:00
parent 0f1b40da71
commit 2b2cae2d50
3 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/reset_test.go
View File

@@ -9,6 +9,7 @@
package integration
import (
"bytes"
"log"
"os"
"path/filepath"
@@ -67,17 +68,17 @@ func TestReset(t *testing.T) {
// Reset indexes of the default folder
log.Println("Reset indexes of default folder")
_, err = p.Post("/rest/system/reset?folder=default", nil)
bs, err := p.Post("/rest/system/reset?folder=default", nil)
if err != nil {
t.Fatal("Failed to reset indexes of the default folder:", err)
t.Fatalf("Failed to reset indexes (default): %v (%s)", err, bytes.TrimSpace(bs))
}
// Syncthing restarts on reset. But we set STNORESTART=1 for the tests. So
// we wait for it to exit, then do a stop so the rc.Process is happy and
// restart it again.
time.Sleep(time.Second)
checkedStop(t, p)
p = startInstance(t, 1)
defer checkedStop(t, p)
m, err = p.Model("default")
if err != nil {
@@ -108,17 +109,14 @@ func TestReset(t *testing.T) {
// Reset all indexes
log.Println("Reset DB...")
_, err = p.Post("/rest/system/reset?folder=default", nil)
bs, err = p.Post("/rest/system/reset", nil)
if err != nil {
t.Fatalf("Failed to reset indexes", err)
t.Fatalf("Failed to reset indexes (all): %v (%s)", err, bytes.TrimSpace(bs))
}
// Syncthing restarts on reset. But we set STNORESTART=1 for the tests. So
// we wait for it to exit, then do a stop so the rc.Process is happy and
// restart it again.
// we wait for it to exit, then restart it again.
time.Sleep(time.Second)
checkedStop(t, p)
p = startInstance(t, 1)
defer checkedStop(t, p)