123

Author: mathspanda

test/cli_run_dns_test.go

@@ -1,10 +1,8 @@
 package main
 
 import (
-	"encoding/json"
 	"strings"
 
-	"github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 
@@ -82,24 +80,24 @@ func (suite *PouchRunDNSSuite) TestRunWithDNSFlags(c *check.C) {
 	defer DelContainerForceMultyTime(c, cname)
 	res.Assert(c, icmd.Success)
 
-	// test if the value is in inspect result
-	inspectRes := command.PouchRun("inspect", cname)
-	res.Assert(c, icmd.Success)
-
-	result := []types.ContainerJSON{}
-	if err := json.Unmarshal([]byte(inspectRes.Stdout()), &result); err != nil {
-		c.Errorf("failed to decode inspect output: %v", err)
-	}
-
-	c.Assert(result[0].HostConfig.DNS, check.DeepEquals, []string{"1.2.3.4"})
-	c.Assert(result[0].HostConfig.DNSOptions, check.DeepEquals, []string{"timeout:3"})
-	c.Assert(result[0].HostConfig.DNSSearch, check.DeepEquals, []string{"example.com"})
-
 	// test if the value is correct in container
 	out := strings.Trim(res.Stdout(), "\n")
 	c.Assert(strings.Contains(out, "nameserver 1.2.3.4"), check.Equals, true)
 	c.Assert(strings.Contains(out, "options timeout:3"), check.Equals, true)
 	c.Assert(strings.Contains(out, "search example.com"), check.Equals, true)
+
+	// test if the value is in inspect result
+	dns, err := inspectFilter(cname, ".HostConfig.DNS")
+	c.Assert(err, check.IsNil)
+	c.Assert(dns, check.Equals, "[1.2.3.4]")
+
+	dnsOptions, err := inspectFilter(cname, ".HostConfig.DNSOptions")
+	c.Assert(err, check.IsNil)
+	c.Assert(dnsOptions, check.Equals, "[timeout:3]")
+
+	dnsSearch, err := inspectFilter(cname, ".HostConfig.DNSSearch")
+	c.Assert(err, check.IsNil)
+	c.Assert(dnsSearch, check.Equals, "[example.com]")
 }
 
 // TestRunWithDNSRepeatFlags tests repeated DNS related flags.
@@ -118,22 +116,22 @@ func (suite *PouchRunDNSSuite) TestRunWithDNSRepeatFlags(c *check.C) {
 	defer DelContainerForceMultyTime(c, cname)
 	res.Assert(c, icmd.Success)
 
-	// test if the value is in inspect result
-	inspectRes := command.PouchRun("inspect", cname)
-	res.Assert(c, icmd.Success)
-
-	result := []types.ContainerJSON{}
-	if err := json.Unmarshal([]byte(inspectRes.Stdout()), &result); err != nil {
-		c.Errorf("failed to decode inspect output: %v", err)
-	}
-
-	c.Assert(result[0].HostConfig.DNS, check.DeepEquals, []string{"1.2.3.4", "2.3.4.5"})
-	c.Assert(result[0].HostConfig.DNSOptions, check.DeepEquals, []string{"timeout:3", "ndots:9"})
-	c.Assert(result[0].HostConfig.DNSSearch, check.DeepEquals, []string{"mydomain", "mydomain2"})
-
 	// test if the value is correct in container
 	out := strings.Trim(res.Stdout(), "\n")
 	c.Assert(strings.Contains(out, "nameserver 1.2.3.4\nnameserver 2.3.4.5"), check.Equals, true)
 	c.Assert(strings.Contains(out, "options timeout:3 ndots:9"), check.Equals, true)
 	c.Assert(strings.Contains(out, "search mydomain mydomain2"), check.Equals, true)
+
+	// test if the value is in inspect result
+	dns, err := inspectFilter(cname, ".HostConfig.DNS")
+	c.Assert(err, check.IsNil)
+	c.Assert(dns, check.Equals, "[1.2.3.4 2.3.4.5]")
+
+	dnsOptions, err := inspectFilter(cname, ".HostConfig.DNSOptions")
+	c.Assert(err, check.IsNil)
+	c.Assert(dnsOptions, check.Equals, "[timeout:3 ndots:9")
+
+	dnsSearch, err := inspectFilter(cname, ".HostConfig.DNSSearch")
+	c.Assert(err, check.IsNil)
+	c.Assert(dnsSearch, check.Equals, "[mydomain mydomain2]")
 }