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

2016-11-22 10:02:39 -06:00
parent dcadf4f9b5
commit cb4cd0e12c
8 changed files with 14 additions and 14 deletions
--- a/plugins/main/ipvlan/ipvlan_test.go
+++ b/plugins/main/ipvlan/ipvlan_test.go
@ -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())