handleJson not return a list

douban · Dec 10, 2015 · 8981717 · 8981717
1 parent 8fa7934
commit 8981717
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/gobeansdb/web.go b/gobeansdb/web.go
@@ -15,8 +15,6 @@ import (
 	mc "github.intra.douban.com/coresys/gobeansdb/memcache"
 	"github.intra.douban.com/coresys/gobeansdb/store"
 	"github.intra.douban.com/coresys/gobeansdb/utils"
-
-	yaml "gopkg.in/yaml.v2"
 )
 
 // TODO:
@@ -101,7 +99,7 @@ func handleWebPanic(w http.ResponseWriter) {
 	}
 }
 
-func handleJson(w http.ResponseWriter, v ...interface{}) {
+func handleJson(w http.ResponseWriter, v interface{}) {
 	defer handleWebPanic(w)
 	b, err := json.Marshal(v)
 	if err != nil {
@@ -111,16 +109,6 @@ func handleJson(w http.ResponseWriter, v ...interface{}) {
 	}
 }
 
-func handleYaml(w http.ResponseWriter, v ...interface{}) {
-	defer handleWebPanic(w)
-	b, err := yaml.Marshal(v)
-	if err != nil {
-		w.Write([]byte(err.Error()))
-	} else {
-		w.Write(b)
-	}
-}
-
 func getBucket(r *http.Request) (bucketID int64, err error) {
 	s := filepath.Base(r.URL.Path)
 	return strconv.ParseInt(s, 16, 16)

diff --git a/tests/base.py b/tests/base.py
@@ -37,7 +37,7 @@ def tearDown(self):
     def checkCounterZero(self):
         time.sleep(0.5)
         content = gethttp(self.db.webaddr, '/buffers')
-        buffers = json.loads(content)[0]
+        buffers = json.loads(content)
         self.assertEqual(len(buffers), 4)
         for _, v in buffers.items():
             self.assertEqual(v['Count'], 0, content)