From 30f138a538c71fe9427ecf49b906a7d73632a779 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 12 Feb 2017 22:18:48 -0800 Subject: [PATCH] fix tests --- weed/topology/configuration_test.go | 42 ----------------------------- weed/topology/volume_growth_test.go | 6 +---- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 weed/topology/configuration_test.go diff --git a/weed/topology/configuration_test.go b/weed/topology/configuration_test.go deleted file mode 100644 index 0a353d16e..000000000 --- a/weed/topology/configuration_test.go +++ /dev/null @@ -1,42 +0,0 @@ -package topology - -import ( - "fmt" - "testing" -) - -func TestLoadConfiguration(t *testing.T) { - - confContent := ` - - - - - - - 192.168.1.1 - - - - - 192.168.1.2 - - - 192.168.1.3 - 192.168.1.4 - - - - -` - 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) - } -} diff --git a/weed/topology/volume_growth_test.go b/weed/topology/volume_growth_test.go index e5716674a..f983df1ec 100644 --- a/weed/topology/volume_growth_test.go +++ b/weed/topology/volume_growth_test.go @@ -79,11 +79,7 @@ func setup(topologyLayout string) *Topology { fmt.Println("data:", data) //need to connect all nodes first before server adding volumes - topo, err := NewTopology("weedfs", "/etc/weedfs/weedfs.conf", - sequence.NewMemorySequencer(), 32*1024, 5) - if err != nil { - panic("error: " + err.Error()) - } + topo := NewTopology("weedfs", sequence.NewMemorySequencer(), 32*1024, 5) mTopology := data.(map[string]interface{}) for dcKey, dcValue := range mTopology { dc := NewDataCenter(dcKey)