diff --git a/config/config_test.go b/config/config_test.go
index 696baecb..7a4891da 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -5,8 +5,6 @@
package config
import (
- "bytes"
- "io"
"os"
"reflect"
"testing"
@@ -40,10 +38,7 @@ func TestDefaultValues(t *testing.T) {
UPnPRenewal: 30,
}
- cfg, err := Load(bytes.NewReader(nil), node1)
- if err != io.EOF {
- t.Error(err)
- }
+ cfg := New("test", node1)
if !reflect.DeepEqual(cfg.Options, expected) {
t.Errorf("Default config differs;\n E: %#v\n A: %#v", expected, cfg.Options)
@@ -51,84 +46,8 @@ func TestDefaultValues(t *testing.T) {
}
func TestNodeConfig(t *testing.T) {
- v1data := []byte(`
-
-
-
- a
-
-
- b
-
-
- a
-
-
- b
-
-
-
- true
- 600
-
-
-`)
-
- v2data := []byte(`
-
-
-
-
-
-
-
-
-
-
- a
-
-
- b
-
-
- 600
-
-
-`)
-
- v3data := []byte(`
-
-
-
-
-
-
- a
-
-
- b
-
-
- 600
-
-`)
-
- v4data := []byte(`
-
-
-
-
-
-
- a
-
-
- b
-
-`)
-
- for i, data := range [][]byte{v1data, v2data, v3data, v4data} {
- cfg, err := Load(bytes.NewReader(data), node1)
+ for i, ver := range []string{"v1", "v2", "v3", "v4"} {
+ cfg, err := Load("testdata/"+ver+".xml", node1)
if err != nil {
t.Error(err)
}
@@ -181,14 +100,7 @@ func TestNodeConfig(t *testing.T) {
}
func TestNoListenAddress(t *testing.T) {
- data := []byte(`
-
-
-
-
-`)
-
- cfg, err := Load(bytes.NewReader(data), node1)
+ cfg, err := Load("testdata/nolistenaddress.xml", node1)
if err != nil {
t.Error(err)
}
@@ -200,26 +112,6 @@ func TestNoListenAddress(t *testing.T) {
}
func TestOverriddenValues(t *testing.T) {
- data := []byte(`
-
- :23000
- false
- syncthing.nym.se:22026
- false
- false
- 42123
- quux:3232
- 32
- 1234
- 6000
- false
- false
- 60
- 15
-
-
-`)
-
expected := OptionsConfiguration{
ListenAddress: []string{":23000"},
GlobalAnnServer: "syncthing.nym.se:22026",
@@ -236,7 +128,7 @@ func TestOverriddenValues(t *testing.T) {
UPnPRenewal: 15,
}
- cfg, err := Load(bytes.NewReader(data), node1)
+ cfg, err := Load("testdata/overridenvalues.xml", node1)
if err != nil {
t.Error(err)
}
@@ -247,19 +139,6 @@ func TestOverriddenValues(t *testing.T) {
}
func TestNodeAddressesDynamic(t *testing.T) {
- data := []byte(`
-
-
-
-
-
-
-
- dynamic
-
-
-`)
-
name, _ := os.Hostname()
expected := []NodeConfiguration{
{
@@ -284,7 +163,7 @@ func TestNodeAddressesDynamic(t *testing.T) {
},
}
- cfg, err := Load(bytes.NewReader(data), node4)
+ cfg, err := Load("testdata/nodeaddressesdynamic.xml", node4)
if err != nil {
t.Error(err)
}
@@ -295,23 +174,6 @@ func TestNodeAddressesDynamic(t *testing.T) {
}
func TestNodeAddressesStatic(t *testing.T) {
- data := []byte(`
-
-
- 192.0.2.1
- 192.0.2.2
-
-
- 192.0.2.3:6070
- [2001:db8::42]:4242
-
-
- [2001:db8::44]:4444
- 192.0.2.4:6090
-
-
-`)
-
name, _ := os.Hostname()
expected := []NodeConfiguration{
{
@@ -333,7 +195,7 @@ func TestNodeAddressesStatic(t *testing.T) {
},
}
- cfg, err := Load(bytes.NewReader(data), node4)
+ cfg, err := Load("testdata/nodeaddressesstatic.xml", node4)
if err != nil {
t.Error(err)
}
@@ -344,18 +206,7 @@ func TestNodeAddressesStatic(t *testing.T) {
}
func TestVersioningConfig(t *testing.T) {
- data := []byte(`
-
-
-
-
-
-
-
-
- `)
-
- cfg, err := Load(bytes.NewReader(data), node4)
+ cfg, err := Load("testdata/versioningconfig.xml", node4)
if err != nil {
t.Error(err)
}
diff --git a/config/testdata/nodeaddressesdynamic.xml b/config/testdata/nodeaddressesdynamic.xml
new file mode 100755
index 00000000..fe506c83
--- /dev/null
+++ b/config/testdata/nodeaddressesdynamic.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+ dynamic
+
+
diff --git a/config/testdata/nodeaddressesstatic.xml b/config/testdata/nodeaddressesstatic.xml
new file mode 100755
index 00000000..23c15928
--- /dev/null
+++ b/config/testdata/nodeaddressesstatic.xml
@@ -0,0 +1,14 @@
+
+
+ 192.0.2.1
+ 192.0.2.2
+
+
+ 192.0.2.3:6070
+ [2001:db8::42]:4242
+
+
+ [2001:db8::44]:4444
+ 192.0.2.4:6090
+
+
diff --git a/config/testdata/nolistenaddress.xml b/config/testdata/nolistenaddress.xml
new file mode 100755
index 00000000..ab9f87b0
--- /dev/null
+++ b/config/testdata/nolistenaddress.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/config/testdata/overridenvalues.xml b/config/testdata/overridenvalues.xml
new file mode 100755
index 00000000..034a662b
--- /dev/null
+++ b/config/testdata/overridenvalues.xml
@@ -0,0 +1,18 @@
+
+
+ :23000
+ false
+ syncthing.nym.se:22026
+ false
+ false
+ 42123
+ quux:3232
+ 32
+ 1234
+ 6000
+ false
+ false
+ 60
+ 15
+
+
diff --git a/config/testdata/v1.xml b/config/testdata/v1.xml
new file mode 100755
index 00000000..2365effb
--- /dev/null
+++ b/config/testdata/v1.xml
@@ -0,0 +1,20 @@
+
+
+
+ a
+
+
+ b
+
+
+ a
+
+
+ b
+
+
+
+ true
+ 600
+
+
diff --git a/config/testdata/v2.xml b/config/testdata/v2.xml
new file mode 100755
index 00000000..bfddd25e
--- /dev/null
+++ b/config/testdata/v2.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+ a
+
+
+ b
+
+
+ 600
+
+
diff --git a/config/testdata/v3.xml b/config/testdata/v3.xml
new file mode 100755
index 00000000..0f527fae
--- /dev/null
+++ b/config/testdata/v3.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+ a
+
+
+ b
+
+
+ 600
+
+
diff --git a/config/testdata/v4.xml b/config/testdata/v4.xml
new file mode 100755
index 00000000..73d6649d
--- /dev/null
+++ b/config/testdata/v4.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+ a
+
+
+ b
+
+
diff --git a/config/testdata/versioningconfig.xml b/config/testdata/versioningconfig.xml
new file mode 100755
index 00000000..c98be30b
--- /dev/null
+++ b/config/testdata/versioningconfig.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/model/model_test.go b/model/model_test.go
index d7238cea..0a417fcf 100644
--- a/model/model_test.go
+++ b/model/model_test.go
@@ -266,7 +266,7 @@ func TestNodeRename(t *testing.T) {
ClientVersion: "v0.9.4",
}
- cfg, _ := config.Load(nil, node1)
+ cfg := config.New("test", node1)
cfg.Nodes = []config.NodeConfiguration{
{
NodeID: node1,