ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

pkg/types: misc current types testcase cleanups

Browse Source
This commit is contained in:
Dan Williams 2017-02-27 13:28:07 -06:00
parent 5a984f0dee
commit 35153e7de8
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/types/current/types_suite_test.go
View File

@ -21,7 +21,7 @@ import (
"testing" "testing"
) )
func TestTypes010(t *testing.T) { func TestTypesCurrent(t *testing.T) {
RegisterFailHandler(Fail) RegisterFailHandler(Fail)
RunSpecs(t, "0.3.0 Types Suite") RunSpecs(t, "Current Types Suite")
} }

38
pkg/types/current/types_test.go
View File

@ -81,7 +81,7 @@ func testResult() *current.Result {
} }
} }
var _ = Describe("Ensures compatibility with the 0.3.0 spec", func() { var _ = Describe("Current types operations", func() {
It("correctly encodes a 0.3.0 Result", func() { It("correctly encodes a 0.3.0 Result", func() {
res := testResult() res := testResult()
@ -150,29 +150,28 @@ var _ = Describe("Ensures compatibility with the 0.3.0 spec", func() {
}`)) }`))
}) })
var _ = Describe("Ensures compatibility with the 0.1.0 spec", func() { It("correctly encodes a 0.1.0 Result", func() {
It("correctly encodes a 0.1.0 Result", func() { res, err := testResult().GetAsVersion("0.1.0")
res, err := testResult().GetAsVersion("0.1.0") Expect(err).NotTo(HaveOccurred())
Expect(err).NotTo(HaveOccurred())
Expect(res.String()).To(Equal("IP4:{IP:{IP:1.2.3.30 Mask:ffffff00} Gateway:1.2.3.1 Routes:[{Dst:{IP:15.5.6.0 Mask:ffffff00} GW:15.5.6.8}]}, IP6:{IP:{IP:abcd:1234:ffff::cdde Mask:ffffffffffffffff0000000000000000} Gateway:abcd:1234:ffff::1 Routes:[{Dst:{IP:1111:dddd:: Mask:ffffffffffffffffffff000000000000} GW:1111:dddd::aaaa}]}, DNS:{Nameservers:[1.2.3.4 1::cafe] Domain:acompany.com Search:[somedomain.com otherdomain.net] Options:[foo bar]}")) Expect(res.String()).To(Equal("IP4:{IP:{IP:1.2.3.30 Mask:ffffff00} Gateway:1.2.3.1 Routes:[{Dst:{IP:15.5.6.0 Mask:ffffff00} GW:15.5.6.8}]}, IP6:{IP:{IP:abcd:1234:ffff::cdde Mask:ffffffffffffffff0000000000000000} Gateway:abcd:1234:ffff::1 Routes:[{Dst:{IP:1111:dddd:: Mask:ffffffffffffffffffff000000000000} GW:1111:dddd::aaaa}]}, DNS:{Nameservers:[1.2.3.4 1::cafe] Domain:acompany.com Search:[somedomain.com otherdomain.net] Options:[foo bar]}"))
// Redirect stdout to capture JSON result // Redirect stdout to capture JSON result
oldStdout := os.Stdout oldStdout := os.Stdout
r, w, err := os.Pipe() r, w, err := os.Pipe()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
os.Stdout = w os.Stdout = w
err = res.Print() err = res.Print()
w.Close() w.Close()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// parse the result // parse the result
out, err := ioutil.ReadAll(r) out, err := ioutil.ReadAll(r)
os.Stdout = oldStdout os.Stdout = oldStdout
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(string(out)).To(Equal(`{ Expect(string(out)).To(Equal(`{
"ip4": { "ip4": {
"ip": "1.2.3.30/24", "ip": "1.2.3.30/24",
"gateway": "1.2.3.1", "gateway": "1.2.3.1",
@ -209,6 +208,5 @@ var _ = Describe("Ensures compatibility with the 0.3.0 spec", func() {
] ]
} }
}`)) }`))
})
}) })
}) })