Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Introduce waitForState test utility (#5585) 

* lib/model: Introduce waitForState test utility

* folder id as param to waitForState
This commit is contained in:
Simon Frei 2019-03-09 11:36:55 +01:00 committed by Audrius Butkevicius
parent b1564e53e4
commit 27ff20faa3
1 changed files with 29 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
lib/model/model_test.go
View File

@ -1768,6 +1768,23 @@ func TestIgnores(t *testing.T) {
changeIgnores(t, m, []string{})
}
func waitForState(t *testing.T, m *model, folder, status string) {
t.Helper()
timeout := time.Now().Add(2 * time.Second)
var err error
for !time.Now().After(timeout) {
_, _, err = m.State(folder)
if err == nil && status == "" {
return
}
if err != nil && err.Error() == status {
return
}
time.Sleep(10 * time.Millisecond)
}
t.Fatalf("Timed out waiting for status: %s, current status: %v", status, err)
}
func TestROScanRecovery(t *testing.T) {
testOs := &fatalOs{t}
@ -1802,57 +1819,24 @@ func TestROScanRecovery(t *testing.T) {
m.ServeBackground()
defer m.Stop()
waitFor := func(status string) error {
timeout := time.Now().Add(2 * time.Second)
for {
_, _, err := m.State("default")
if err == nil && status == "" {
return nil
}
if err != nil && err.Error() == status {
return nil
}
if time.Now().After(timeout) {
return fmt.Errorf("Timed out waiting for status: %s, current status: %v", status, err)
}
time.Sleep(10 * time.Millisecond)
}
}
if err := waitFor("folder path missing"); err != nil {
t.Error(err)
return
}
waitForState(t, m, "default", "folder path missing")
testOs.Mkdir(fcfg.Path, 0700)
if err := waitFor("folder marker missing"); err != nil {
t.Error(err)
return
}
waitForState(t, m, "default", "folder marker missing")
fd := testOs.Create(filepath.Join(fcfg.Path, config.DefaultMarkerName))
fd.Close()
if err := waitFor(""); err != nil {
t.Error(err)
return
}
waitForState(t, m, "default", "")
testOs.Remove(filepath.Join(fcfg.Path, config.DefaultMarkerName))
if err := waitFor("folder marker missing"); err != nil {
t.Error(err)
return
}
waitForState(t, m, "default", "folder marker missing")
testOs.Remove(fcfg.Path)
if err := waitFor("folder path missing"); err != nil {
t.Error(err)
return
}
waitForState(t, m, "default", "folder path missing")
}
func TestRWScanRecovery(t *testing.T) {
@ -1889,54 +1873,24 @@ func TestRWScanRecovery(t *testing.T) {
m.ServeBackground()
defer m.Stop()
waitFor := func(status string) error {
timeout := time.Now().Add(2 * time.Second)
for {
_, _, err := m.State("default")
if err == nil && status == "" {
return nil
}
if err != nil && err.Error() == status {
return nil
}
if time.Now().After(timeout) {
return fmt.Errorf("Timed out waiting for status: %s, current status: %v", status, err)
}
time.Sleep(10 * time.Millisecond)
}
}
if err := waitFor("folder path missing"); err != nil {
t.Error(err)
return
}
waitForState(t, m, "default", "folder path missing")
testOs.Mkdir(fcfg.Path, 0700)
if err := waitFor("folder marker missing"); err != nil {
t.Error(err)
return
}
waitForState(t, m, "default", "folder marker missing")
fd := testOs.Create(filepath.Join(fcfg.Path, config.DefaultMarkerName))
fd.Close()
if err := waitFor(""); err != nil {
t.Fatal(err)
}
waitForState(t, m, "default", "")
testOs.Remove(filepath.Join(fcfg.Path, config.DefaultMarkerName))
if err := waitFor("folder marker missing"); err != nil {
t.Fatal(err)
}
waitForState(t, m, "default", "folder marker missing")
testOs.Remove(fcfg.Path)
if err := waitFor("folder path missing"); err != nil {
t.Fatal(err)
}
waitForState(t, m, "default", "folder path missing")
}
func TestGlobalDirectoryTree(t *testing.T) {
@ -3058,35 +3012,13 @@ func TestCustomMarkerName(t *testing.T) {
m.ServeBackground()
defer m.Stop()
waitFor := func(status string) error {
timeout := time.Now().Add(2 * time.Second)
for {
_, _, err := m.State("default")
if err == nil && status == "" {
return nil
}
if err != nil && err.Error() == status {
return nil
}
if time.Now().After(timeout) {
return fmt.Errorf("Timed out waiting for status: %s, current status: %v", status, err)
}
time.Sleep(10 * time.Millisecond)
}
}
if err := waitFor("folder path missing"); err != nil {
t.Fatal(err)
}
waitForState(t, m, "default", "folder path missing")
testOs.Mkdir(fcfg.Path, 0700)
fd := testOs.Create(filepath.Join(fcfg.Path, "myfile"))
fd.Close()
if err := waitFor(""); err != nil {
t.Fatal(err)
}
waitForState(t, m, "default", "")
}
func TestRemoveDirWithContent(t *testing.T) {