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

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

@ -62,7 +62,7 @@ var _ = Describe("host-local Operations", func() {
}
// Allocate the IP
result, err := testutils.CmdAddWithResult(nspath, ifname, func() error {
result, _, err := testutils.CmdAddWithResult(nspath, ifname, []byte(conf), func() error {
return cmdAdd(args)
})
Expect(err).NotTo(HaveOccurred())
@ -124,7 +124,7 @@ var _ = Describe("host-local Operations", func() {
}
// Allocate the IP
result, err := testutils.CmdAddWithResult(nspath, ifname, func() error {
result, _, err := testutils.CmdAddWithResult(nspath, ifname, []byte(conf), func() error {
return cmdAdd(args)
})
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 {
defer GinkgoRecover()
_, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, func() error {
_, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(conf), func() error {
return cmdAdd(args)
})
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 {
defer GinkgoRecover()
_, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, func() error {
_, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(conf), func() error {
return cmdAdd(args)
})
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 {
defer GinkgoRecover()
_, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, func() error {
_, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(conf), func() error {
return cmdAdd(args)
})
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 {
defer GinkgoRecover()
_, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, func() error {
_, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(conf), func() error {
return cmdAdd(args)
})
Expect(err).NotTo(HaveOccurred())

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

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