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

lib/model: Clarify master terminology (fixes #2679)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3793
This commit is contained in:
Heiko Zuerker
2016-12-16 22:23:35 +00:00
committed by Audrius Butkevicius
parent 542b76f687
commit 398c356f22
13 changed files with 72 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/model/model_test.go
View File

@@ -1028,7 +1028,7 @@ func TestROScanRecovery(t *testing.T) {
fcfg := config.FolderConfiguration{
ID: "default",
RawPath: "testdata/rotestfolder",
Type: config.FolderTypeReadOnly,
Type: config.FolderTypeSendOnly,
RescanIntervalS: 1,
}
cfg := config.Wrap("/tmp/test", config.Configuration{
@@ -1115,7 +1115,7 @@ func TestRWScanRecovery(t *testing.T) {
fcfg := config.FolderConfiguration{
ID: "default",
RawPath: "testdata/rwtestfolder",
Type: config.FolderTypeReadWrite,
Type: config.FolderTypeSendReceive,
RescanIntervalS: 1,
}
cfg := config.Wrap("/tmp/test", config.Configuration{
@@ -1763,11 +1763,11 @@ func TestIssue3028(t *testing.T) {
m.StartFolder("default")
m.ServeBackground()
// Ugly hack for testing: reach into the model for the rwfolder and wait
// Ugly hack for testing: reach into the model for the SendReceiveFolder and wait
// for it to complete the initial scan. The risk is that it otherwise
// runs during our modifications and screws up the test.
m.fmut.RLock()
folder := m.folderRunners["default"].(*rwFolder)
folder := m.folderRunners["default"].(*sendReceiveFolder)
m.fmut.RUnlock()
<-folder.initialScanCompleted
@@ -1822,7 +1822,7 @@ func TestIssue3164(t *testing.T) {
t.Fatal(err)
}
fl := rwFolder{
fl := sendReceiveFolder{
dbUpdates: make(chan dbUpdateJob, 1),
dir: "testdata",
}