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

@@ -14,6 +14,7 @@ import (
"testing"
"github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/events"
"github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/rc"
)
@@ -21,7 +22,7 @@ import (
func TestFileTypeChange(t *testing.T) {
// Use no versioning
id, _ := protocol.DeviceIDFromString(id2)
cfg, _ := config.Load("h2/config.xml", id)
cfg, _ := config.Load("h2/config.xml", id, events.NoopLogger)
fld := cfg.Folders()["default"]
fld.Versioning = config.VersioningConfiguration{}
cfg.SetFolder(fld)
@@ -35,7 +36,7 @@ func TestFileTypeChange(t *testing.T) {
func TestFileTypeChangeSimpleVersioning(t *testing.T) {
// Use simple versioning
id, _ := protocol.DeviceIDFromString(id2)
cfg, _ := config.Load("h2/config.xml", id)
cfg, _ := config.Load("h2/config.xml", id, events.NoopLogger)
fld := cfg.Folders()["default"]
fld.Versioning = config.VersioningConfiguration{
Type: "simple",
@@ -52,7 +53,7 @@ func TestFileTypeChangeSimpleVersioning(t *testing.T) {
func TestFileTypeChangeStaggeredVersioning(t *testing.T) {
// Use staggered versioning
id, _ := protocol.DeviceIDFromString(id2)
cfg, _ := config.Load("h2/config.xml", id)
cfg, _ := config.Load("h2/config.xml", id, events.NoopLogger)
fld := cfg.Folders()["default"]
fld.Versioning = config.VersioningConfiguration{
Type: "staggered",