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/meta/flannel/flannel_test.go
+++ b/plugins/meta/flannel/flannel_test.go
@ -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())