From 72193e3ef519c6385efa31e54bbad681c3fee247 Mon Sep 17 00:00:00 2001
From: Tony <i@tony.wiki>
Date: Fri, 5 Jul 2019 16:59:00 +0800
Subject: [PATCH] fix unit test
---
pkg/net/http/blademaster/server_test.go | 15 ++++++++-------
pkg/net/rpc/warden/balancer/p2c/p2c_test.go | 10 +++++-----
pkg/stat/sys/cpu/cpu.go | 3 ++-
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/pkg/net/http/blademaster/server_test.go b/pkg/net/http/blademaster/server_test.go
index c4ab6f6f5..16c166980 100644
--- a/pkg/net/http/blademaster/server_test.go
+++ b/pkg/net/http/blademaster/server_test.go
@@ -20,7 +20,6 @@ import (
var (
sonce sync.Once
- SockAddr = "localhost:18080"
curEngine atomic.Value
)
@@ -50,16 +49,17 @@ func setupHandler(engine *Engine) {
})
}
-func startServer() {
+func startServer(addr string) {
e := DefaultServer(nil)
setupHandler(e)
- go e.Run(SockAddr)
+ go e.Run(addr)
curEngine.Store(e)
time.Sleep(time.Second)
}
func TestCriticality(t *testing.T) {
- startServer()
+ addr := "localhost:18001"
+ startServer(addr)
defer shutdown()
tests := []*struct {
@@ -85,7 +85,7 @@ func TestCriticality(t *testing.T) {
}
client := &http.Client{}
for _, testCase := range tests {
- req, err := http.NewRequest("GET", uri(SockAddr, testCase.path), nil)
+ req, err := http.NewRequest("GET", uri(addr, testCase.path), nil)
assert.NoError(t, err)
req.Header.Set("x-bm-metadata-criticality", string(testCase.crtl))
resp, err := client.Do(req)
@@ -98,7 +98,8 @@ func TestCriticality(t *testing.T) {
}
func TestNoneCriticality(t *testing.T) {
- startServer()
+ addr := "localhost:18002"
+ startServer(addr)
defer shutdown()
tests := []*struct {
@@ -124,7 +125,7 @@ func TestNoneCriticality(t *testing.T) {
}
client := &http.Client{}
for _, testCase := range tests {
- req, err := http.NewRequest("GET", uri(SockAddr, testCase.path), nil)
+ req, err := http.NewRequest("GET", uri(addr, testCase.path), nil)
assert.NoError(t, err)
req.Header.Set("x-bm-metadata-criticality", string(testCase.crtl))
resp, err := client.Do(req)
diff --git a/pkg/net/rpc/warden/balancer/p2c/p2c_test.go b/pkg/net/rpc/warden/balancer/p2c/p2c_test.go
index ae35d5ddb..45385262a 100644
--- a/pkg/net/rpc/warden/balancer/p2c/p2c_test.go
+++ b/pkg/net/rpc/warden/balancer/p2c/p2c_test.go
@@ -30,12 +30,12 @@ var extraDelay int64
var extraWeight uint64
func init() {
- flag.IntVar(&serverNum, "snum", 5, "-snum 6")
- flag.IntVar(&cliNum, "cnum", 5, "-cnum 12")
- flag.IntVar(&concurrency, "concurrency", 5, "-cc 10")
+ flag.IntVar(&serverNum, "snum", 6, "-snum 6")
+ flag.IntVar(&cliNum, "cnum", 12, "-cnum 12")
+ flag.IntVar(&concurrency, "concurrency", 10, "-cc 10")
flag.Int64Var(&extraLoad, "exload", 3, "-exload 3")
- flag.Int64Var(&extraDelay, "exdelay", 0, "-exdelay 250")
- flag.Uint64Var(&extraWeight, "extraWeight", 0, "-exdelay 50")
+ flag.Int64Var(&extraDelay, "exdelay", 250, "-exdelay 250")
+ flag.Uint64Var(&extraWeight, "extraWeight", 50, "-exdelay 50")
}
type testSubConn struct {
diff --git a/pkg/stat/sys/cpu/cpu.go b/pkg/stat/sys/cpu/cpu.go
index 2718536f3..92d8a5c78 100644
--- a/pkg/stat/sys/cpu/cpu.go
+++ b/pkg/stat/sys/cpu/cpu.go
@@ -15,6 +15,7 @@ var (
usage uint64
)
+// CPU is cpu stat usage.
type CPU interface {
Usage() (u uint64, e error)
Info() Info
@@ -26,7 +27,7 @@ func init() {
)
stats, err = newCgroupCPU()
if err != nil {
- fmt.Printf("cgroup cpu init failed(%v),switch to psutil cpu\n", err)
+ // fmt.Printf("cgroup cpu init failed(%v),switch to psutil cpu\n", err)
stats, err = newPsutilCPU(interval)
if err != nil {
panic(fmt.Sprintf("cgroup cpu init failed!err:=%v", err))