aboutsummaryrefslogtreecommitdiff
path: root/weed-fs/src
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2012-09-21 01:31:52 -0700
committerChris Lu <chris.lu@gmail.com>2012-09-21 01:31:52 -0700
commite986dcf5e084c28bed18a7596f482d53282848ed (patch)
treeeef7e54ae9fd1d390db92e9a03a4e940205c311d /weed-fs/src
parentd056c622bff10bff05e589d509ecc88717db4b75 (diff)
downloadseaweedfs-e986dcf5e084c28bed18a7596f482d53282848ed.tar.xz
seaweedfs-e986dcf5e084c28bed18a7596f482d53282848ed.zip
adjusting testing
Diffstat (limited to 'weed-fs/src')
-rw-r--r--weed-fs/src/pkg/topology/node_list_test.go2
-rw-r--r--weed-fs/src/pkg/topology/topo_test.go6
2 files changed, 4 insertions, 4 deletions
diff --git a/weed-fs/src/pkg/topology/node_list_test.go b/weed-fs/src/pkg/topology/node_list_test.go
index 1e5b0d9f6..3a948075c 100644
--- a/weed-fs/src/pkg/topology/node_list_test.go
+++ b/weed-fs/src/pkg/topology/node_list_test.go
@@ -7,7 +7,7 @@ import (
)
func TestXYZ(t *testing.T) {
- topo := NewTopology("topo")
+ topo := NewTopology("topo","/tmp","test",234,5)
for i := 0; i < 5; i++ {
dc := NewDataCenter("dc" + strconv.Itoa(i))
dc.activeVolumeCount = i
diff --git a/weed-fs/src/pkg/topology/topo_test.go b/weed-fs/src/pkg/topology/topo_test.go
index 6251b1d07..707aa60fe 100644
--- a/weed-fs/src/pkg/topology/topo_test.go
+++ b/weed-fs/src/pkg/topology/topo_test.go
@@ -80,7 +80,7 @@ func setup(topologyLayout string) *Topology {
//printMap(data)
//need to connect all nodes first before server adding volumes
- topo := NewTopology("mynetwork")
+ topo := NewTopology("mynetwork","/tmp","test",234,5)
mTopology := data.(map[string]interface{})
for dcKey, dcValue := range mTopology {
dc := NewDataCenter(dcKey)
@@ -96,8 +96,8 @@ func setup(topologyLayout string) *Topology {
rack.LinkChildNode(server)
for _, v := range serverMap["volumes"].([]interface{}) {
m := v.(map[string]interface{})
- vi := &storage.VolumeInfo{Id: storage.VolumeId(int64(m["id"].(float64))), Size: int64(m["size"].(float64))}
- server.AddVolume(vi)
+ vi := storage.VolumeInfo{Id: storage.VolumeId(int64(m["id"].(float64))), Size: int64(m["size"].(float64))}
+ server.AddOrUpdateVolume(vi)
}
server.UpAdjustMaxVolumeCountDelta(int(serverMap["limit"].(float64)))
}