test: Get integration tests up to speed (config, build and test fixes) (#5962)

This commit is contained in:
Simon Frei
2019-08-20 10:17:11 +02:00
committed by GitHub
parent 90b70c7a16
commit 2d124e053c
8 changed files with 59 additions and 21 deletions

View File

@@ -17,6 +17,7 @@ import (
"time"
"github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/events"
"github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/rc"
)
@@ -24,7 +25,7 @@ import (
func TestOverride(t *testing.T) {
// Enable "send-only" on s1/default
id, _ := protocol.DeviceIDFromString(id1)
cfg, _ := config.Load("h1/config.xml", id)
cfg, _ := config.Load("h1/config.xml", id, events.NoopLogger)
fld := cfg.Folders()["default"]
fld.Type = config.FolderTypeSendOnly
cfg.SetFolder(fld)
@@ -156,7 +157,7 @@ get to completion when in sendOnly/sendRecv mode. Needs fixing.
func TestOverrideIgnores(t *testing.T) {
// Enable "sendOnly" on s1/default
id, _ := protocol.DeviceIDFromString(id1)
cfg, _ := config.Load("h1/config.xml", id)
cfg, _ := config.Load("h1/config.xml", id, events.NoopLogger)
fld := cfg.Folders()["default"]
fld.ReadOnly = true
cfg.SetFolder(fld)