Merge pull request #46 from linkernetworks/hwchiu/fix-test

Add test for exec command Former-commit-id: 88db84c484c62e7a0d186a80c83ca01b088d1dc9 [formerly 88db84c484c62e7a0d186a80c83ca01b088d1dc9 [formerly 1031c6a]] Former-commit-id: 7f33f7262f16f2ce42e939ea74de0975dc420958 Former-commit-id: f49b1ff
linkernetworks · Jun 27, 2018 · 102d812 · 102d812
2 parents 7c29ce9 + 0911aae
commit 102d812
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 10 deletions.
diff --git a/src/networkcontroller/network_controller_test.go b/src/networkcontroller/network_controller_test.go
@@ -1,6 +1,7 @@
 package networkcontroller
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/kubernetes"
@@ -16,12 +17,22 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
+
+	"gopkg.in/mgo.v2/bson"
 )
 
 func init() {
 	rand.Seed(time.Now().UnixNano())
 }
 
+func execute(suite *suite.Suite, cmd *exec.Cmd) {
+	w := bytes.NewBuffer(nil)
+	cmd.Stderr = w
+	err := cmd.Run()
+	suite.NoError(err)
+	fmt.Printf("Stderr: %s\n", string(w.Bytes()))
+}
+
 type NetworkControllerTestSuite struct {
 	suite.Suite
 	kubectl  *kubernetes.KubeCtl
@@ -55,11 +66,17 @@ func (suite *NetworkControllerTestSuite) SetupSuite() {
 	suite.NoError(err)
 
 	//There's a length limit of link name
-	suite.ifName = namesgenerator.GetRandomName(0)[0:8]
-	pName := namesgenerator.GetRandomName(0)[0:8]
+	suite.ifName = bson.NewObjectId().Hex()[12:24]
+	pName := bson.NewObjectId().Hex()[12:24]
 	//Create a veth for testing
-	err = exec.Command("ip", "link", "add", suite.ifName, "type", "veth", "peer", "name", pName).Run()
-	suite.NoError(err)
+	fmt.Println("ip", "link", "add", suite.ifName, "type", "veth", "peer", "name", pName)
+	cmd := exec.Command("ip", "link", "add", suite.ifName, "type", "veth", "peer", "name", pName)
+	execute(&suite.Suite, cmd)
+}
+
+func (suite *NetworkControllerTestSuite) TearDownSuite() {
+	cmd := exec.Command("ip", "link", "del", suite.ifName)
+	execute(&suite.Suite, cmd)
 }
 
 func TestNetworkControllerSuite(t *testing.T) {

diff --git a/src/server/handler_network_test.go b/src/server/handler_network_test.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"math/rand"
@@ -35,6 +36,14 @@ func init() {
 	rand.Seed(time.Now().UnixNano())
 }
 
+func execute(suite *suite.Suite, cmd *exec.Cmd) {
+	w := bytes.NewBuffer(nil)
+	cmd.Stderr = w
+	err := cmd.Run()
+	suite.NoError(err)
+	fmt.Printf("Stderr: %s\n", string(w.Bytes()))
+}
+
 type NetworkTestSuite struct {
 	suite.Suite
 	wc       *restful.Container
@@ -79,16 +88,17 @@ func (suite *NetworkTestSuite) SetupSuite() {
 	suite.NoError(err)
 
 	//There's a length limit of link name
-	suite.ifName = namesgenerator.GetRandomName(0)[0:8]
-	pName := namesgenerator.GetRandomName(0)[0:8]
+	suite.ifName = bson.NewObjectId().Hex()[12:24]
+	pName := bson.NewObjectId().Hex()[12:24]
 	//Create a veth for testing
-	err = exec.Command("ip", "link", "add", suite.ifName, "type", "veth", "peer", "name", pName).Run()
-	suite.NoError(err)
+	fmt.Println("ip", "link", "add", suite.ifName, "type", "veth", "peer", "name", pName)
+	cmd := exec.Command("ip", "link", "add", suite.ifName, "type", "veth", "peer", "name", pName)
+	execute(&suite.Suite, cmd)
 }
 
 func (suite *NetworkTestSuite) TearDownSuite() {
-	err := exec.Command("ip", "link", "del", suite.ifName).Run()
-	suite.NoError(err)
+	cmd := exec.Command("ip", "link", "del", suite.ifName)
+	execute(&suite.Suite, cmd)
 }
 
 func TestNetworkSuite(t *testing.T) {