Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct tests for uppercase-only node IDs

This commit is contained in:
Jakob Borg 2014-05-25 14:54:50 +02:00
parent 4031f5e24b
commit dd971b56e5
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
config/config_test.go
View File

@ -38,10 +38,10 @@ func TestNodeConfig(t *testing.T) {
v1data := []byte(` v1data := []byte(`
<configuration version="1"> <configuration version="1">
<repository id="test" directory="~/Sync"> <repository id="test" directory="~/Sync">
<node id="node1" name="node one"> <node id="NODE1" name="node one">
<address>a</address> <address>a</address>
</node> </node>
<node id="node2" name="node two"> <node id="NODE2" name="node two">
<address>b</address> <address>b</address>
</node> </node>
</repository> </repository>
@ -54,20 +54,20 @@ func TestNodeConfig(t *testing.T) {
v2data := []byte(` v2data := []byte(`
<configuration version="2"> <configuration version="2">
<repository id="test" directory="~/Sync" ro="true"> <repository id="test" directory="~/Sync" ro="true">
<node id="node1"/> <node id="NODE1"/>
<node id="node2"/> <node id="NODE2"/>
</repository> </repository>
<node id="node1" name="node one"> <node id="NODE1" name="node one">
<address>a</address> <address>a</address>
</node> </node>
<node id="node2" name="node two"> <node id="NODE2" name="node two">
<address>b</address> <address>b</address>
</node> </node>
</configuration> </configuration>
`) `)
for i, data := range [][]byte{v1data, v2data} { for i, data := range [][]byte{v1data, v2data} {
cfg, err := Load(bytes.NewReader(data), "node1") cfg, err := Load(bytes.NewReader(data), "NODE1")
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -76,23 +76,23 @@ func TestNodeConfig(t *testing.T) {
{ {
ID: "test", ID: "test",
Directory: "~/Sync", Directory: "~/Sync",
Nodes: []NodeConfiguration{{NodeID: "node1"}, {NodeID: "node2"}}, Nodes: []NodeConfiguration{{NodeID: "NODE1"}, {NodeID: "NODE2"}},
ReadOnly: true, ReadOnly: true,
}, },
} }
expectedNodes := []NodeConfiguration{ expectedNodes := []NodeConfiguration{
{ {
NodeID: "node1", NodeID: "NODE1",
Name: "node one", Name: "node one",
Addresses: []string{"a"}, Addresses: []string{"a"},
}, },
{ {
NodeID: "node2", NodeID: "NODE2",
Name: "node two", Name: "node two",
Addresses: []string{"b"}, Addresses: []string{"b"},
}, },
} }
expectedNodeIDs := []string{"node1", "node2"} expectedNodeIDs := []string{"NODE1", "NODE2"}
if cfg.Version != 2 { if cfg.Version != 2 {
t.Errorf("%d: Incorrect version %d != 2", i, cfg.Version) t.Errorf("%d: Incorrect version %d != 2", i, cfg.Version)
@ -200,25 +200,25 @@ func TestNodeAddresses(t *testing.T) {
name, _ := os.Hostname() name, _ := os.Hostname()
expected := []NodeConfiguration{ expected := []NodeConfiguration{
{ {
NodeID: "n1", NodeID: "N1",
Addresses: []string{"dynamic"}, Addresses: []string{"dynamic"},
}, },
{ {
NodeID: "n2", NodeID: "N2",
Addresses: []string{"dynamic"}, Addresses: []string{"dynamic"},
}, },
{ {
NodeID: "n3", NodeID: "N3",
Addresses: []string{"dynamic"}, Addresses: []string{"dynamic"},
}, },
{ {
NodeID: "n4", NodeID: "N4",
Name: name, // Set when auto created Name: name, // Set when auto created
Addresses: []string{"dynamic"}, Addresses: []string{"dynamic"},
}, },
} }
cfg, err := Load(bytes.NewReader(data), "n4") cfg, err := Load(bytes.NewReader(data), "N4")
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }