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

model: TestIgnores should not randomly fail

Browse Source
This commit is contained in:
Jakob Borg 2015-04-04 22:55:24 +02:00
parent ab6bcab78a
commit 739c525a98
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/model/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
.stfolder
.stignore

9
internal/model/model_test.go
View File

@ -10,6 +10,7 @@ import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil"
"math/rand" "math/rand"
"os" "os"
"path/filepath" "path/filepath"
@ -49,6 +50,10 @@ func init() {
DeviceID: device1, DeviceID: device1,
}, },
}, },
Options: config.OptionsConfiguration{
// Don't remove temporaries directly on startup
KeepTemporariesH: 1,
},
} }
defaultConfig = config.Wrap("/tmp/test", _defaultConfig) defaultConfig = config.Wrap("/tmp/test", _defaultConfig)
} }
@ -469,6 +474,9 @@ func TestIgnores(t *testing.T) {
return true return true
} }
// Assure a clean start state
ioutil.WriteFile("testdata/.stignore", []byte(".*\nquux\n"), 0644)
db, _ := leveldb.Open(storage.NewMemStorage(), nil) db, _ := leveldb.Open(storage.NewMemStorage(), nil)
m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db) m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db)
m.AddFolder(defaultFolderConfig) m.AddFolder(defaultFolderConfig)
@ -989,7 +997,6 @@ func TestGlobalDirectoryTree(t *testing.T) {
} }
func TestGlobalDirectorySelfFixing(t *testing.T) { func TestGlobalDirectorySelfFixing(t *testing.T) {
db, _ := leveldb.Open(storage.NewMemStorage(), nil) db, _ := leveldb.Open(storage.NewMemStorage(), nil)
m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db) m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db)
m.AddFolder(defaultFolderConfig) m.AddFolder(defaultFolderConfig)