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

testutils: pass netConf in for version operations; pass raw result out for tests

Browse Source
This commit is contained in:
Dan Williams
2016-11-22 10:02:39 -06:00
parent dcadf4f9b5
commit cb4cd0e12c
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/testutils/cmd.go
View File

@ -29,7 +29,7 @@ func envCleanup() {
os.Unsetenv("CNI_IFNAME") os.Unsetenv("CNI_IFNAME")
} }
func CmdAddWithResult(cniNetns, cniIfname string, f func() error) (*types.Result, error) { func CmdAddWithResult(cniNetns, cniIfname string, conf []byte, f func() error) (*types.Result, []byte, error) {
os.Setenv("CNI_COMMAND", "ADD") os.Setenv("CNI_COMMAND", "ADD")
os.Setenv("CNI_PATH", os.Getenv("PATH")) os.Setenv("CNI_PATH", os.Getenv("PATH"))
os.Setenv("CNI_NETNS", cniNetns) os.Setenv("CNI_NETNS", cniNetns)
@ -40,30 +40,30 @@ func CmdAddWithResult(cniNetns, cniIfname string, f func() error) (*types.Result
oldStdout := os.Stdout oldStdout := os.Stdout
r, w, err := os.Pipe() r, w, err := os.Pipe()
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
os.Stdout = w os.Stdout = w
err = f() err = f()
w.Close() w.Close()
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
// parse the result // parse the result
out, err := ioutil.ReadAll(r) out, err := ioutil.ReadAll(r)
os.Stdout = oldStdout os.Stdout = oldStdout
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
result := types.Result{} result := types.Result{}
err = json.Unmarshal(out, &result) err = json.Unmarshal(out, &result)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
return &result, nil return &result, out, nil
} }
func CmdDelWithResult(cniNetns, cniIfname string, f func() error) error { func CmdDelWithResult(cniNetns, cniIfname string, f func() error) error {

4
plugins/ipam/host-local/host_local_test.go
View File

@ -62,7 +62,7 @@ var _ = Describe("host-local Operations", func() {
} }
// Allocate the IP // Allocate the IP
result, err := testutils.CmdAddWithResult(nspath, ifname, func() error { result, _, err := testutils.CmdAddWithResult(nspath, ifname, []byte(conf), func() error {
return cmdAdd(args) return cmdAdd(args)
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -124,7 +124,7 @@ var _ = Describe("host-local Operations", func() {
} }
// Allocate the IP // Allocate the IP
result, err := testutils.CmdAddWithResult(nspath, ifname, func() error { result, _, err := testutils.CmdAddWithResult(nspath, ifname, []byte(conf), func() error {
return cmdAdd(args) return cmdAdd(args)
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

2
plugins/main/bridge/bridge_test.go
View File

@ -154,7 +154,7 @@ var _ = Describe("bridge Operations", func() {
err = originalNS.Do(func(ns.NetNS) error { err = originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, func() error { _, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(conf), func() error {
return cmdAdd(args) return cmdAdd(args)
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

2
plugins/main/ipvlan/ipvlan_test.go
View File

@ -126,7 +126,7 @@ var _ = Describe("ipvlan Operations", func() {
err = originalNS.Do(func(ns.NetNS) error { err = originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, func() error { _, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(conf), func() error {
return cmdAdd(args) return cmdAdd(args)
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

2
plugins/main/macvlan/macvlan_test.go
View File

@ -127,7 +127,7 @@ var _ = Describe("macvlan Operations", func() {
err = originalNS.Do(func(ns.NetNS) error { err = originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, func() error { _, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(conf), func() error {
return cmdAdd(args) return cmdAdd(args)
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

2
plugins/main/ptp/ptp_test.go
View File

@ -69,7 +69,7 @@ var _ = Describe("ptp Operations", func() {
err = originalNS.Do(func(ns.NetNS) error { err = originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, func() error { _, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(conf), func() error {
return cmdAdd(args) return cmdAdd(args)
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

2
plugins/meta/flannel/flannel_test.go
View File

@ -102,7 +102,7 @@ FLANNEL_IPMASQ=true
defer GinkgoRecover() defer GinkgoRecover()
By("calling ADD") By("calling ADD")
_, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, func() error { _, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(input), func() error {
return cmdAdd(args) return cmdAdd(args)
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

2
test
View File

@ -11,7 +11,7 @@ set -e
source ./build source ./build
TESTABLE="libcni plugins/ipam/dhcp plugins/ipam/dhcp plugins/ipam/host-local/backend/allocator plugins/ipam/host-local/backend plugins/main/loopback pkg/invoke pkg/ns pkg/skel pkg/types pkg/utils plugins/main/ipvlan plugins/main/macvlan plugins/main/bridge plugins/main/ptp plugins/test/noop pkg/utils/hwaddr pkg/ip pkg/version pkg/version/testhelpers plugins/meta/flannel" TESTABLE="libcni plugins/ipam/dhcp plugins/ipam/host-local plugins/ipam/host-local/backend/allocator plugins/main/loopback pkg/invoke pkg/ns pkg/skel pkg/types pkg/utils plugins/main/ipvlan plugins/main/macvlan plugins/main/bridge plugins/main/ptp plugins/test/noop pkg/utils/hwaddr pkg/ip pkg/version pkg/version/testhelpers plugins/meta/flannel"
FORMATTABLE="$TESTABLE pkg/testutils plugins/meta/flannel plugins/meta/tuning" FORMATTABLE="$TESTABLE pkg/testutils plugins/meta/flannel plugins/meta/tuning"
# user has not provided PKG override # user has not provided PKG override