mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
fix tests
This commit is contained in:
parent
41f686ab9d
commit
30f138a538
|
@ -1,42 +0,0 @@
|
||||||
package topology
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestLoadConfiguration(t *testing.T) {
|
|
||||||
|
|
||||||
confContent := `
|
|
||||||
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<Configuration>
|
|
||||||
<Topology>
|
|
||||||
<DataCenter name="dc1">
|
|
||||||
<Rack name="rack1">
|
|
||||||
<Ip>192.168.1.1</Ip>
|
|
||||||
</Rack>
|
|
||||||
</DataCenter>
|
|
||||||
<DataCenter name="dc2">
|
|
||||||
<Rack name="rack1">
|
|
||||||
<Ip>192.168.1.2</Ip>
|
|
||||||
</Rack>
|
|
||||||
<Rack name="rack2">
|
|
||||||
<Ip>192.168.1.3</Ip>
|
|
||||||
<Ip>192.168.1.4</Ip>
|
|
||||||
</Rack>
|
|
||||||
</DataCenter>
|
|
||||||
</Topology>
|
|
||||||
</Configuration>
|
|
||||||
`
|
|
||||||
c, err := NewConfiguration([]byte(confContent))
|
|
||||||
|
|
||||||
fmt.Printf("%s\n", c)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("unmarshal error:%v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(c.Topo.DataCenters) <= 0 || c.Topo.DataCenters[0].Name != "dc1" {
|
|
||||||
t.Fatalf("unmarshal error:%s", c)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -79,11 +79,7 @@ func setup(topologyLayout string) *Topology {
|
||||||
fmt.Println("data:", data)
|
fmt.Println("data:", data)
|
||||||
|
|
||||||
//need to connect all nodes first before server adding volumes
|
//need to connect all nodes first before server adding volumes
|
||||||
topo, err := NewTopology("weedfs", "/etc/weedfs/weedfs.conf",
|
topo := NewTopology("weedfs", sequence.NewMemorySequencer(), 32*1024, 5)
|
||||||
sequence.NewMemorySequencer(), 32*1024, 5)
|
|
||||||
if err != nil {
|
|
||||||
panic("error: " + err.Error())
|
|
||||||
}
|
|
||||||
mTopology := data.(map[string]interface{})
|
mTopology := data.(map[string]interface{})
|
||||||
for dcKey, dcValue := range mTopology {
|
for dcKey, dcValue := range mTopology {
|
||||||
dc := NewDataCenter(dcKey)
|
dc := NewDataCenter(dcKey)
|
||||||
|
|
Loading…
Reference in a new issue