From 07ab8525204f867e65133f2bc91ceab05e03160b Mon Sep 17 00:00:00 2001 From: Kuralamudhan Ramakrishnan Date: Mon, 21 Jan 2019 23:15:13 +0000 Subject: [PATCH] adding unit test fixes --- multus/multus.go | 2 +- multus/multus_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/multus/multus.go b/multus/multus.go index 4cb8a4c2c..40bfb816f 100644 --- a/multus/multus.go +++ b/multus/multus.go @@ -367,7 +367,7 @@ func updateRoutes(rObj cnitypes.Result) (cnitypes.Result, error) { // fixInterfaces fixes bad result returned by CNI plugin // some plugins(for example calico) return empty Interfaces list but -// in IPConfig sets Interface index to 0. In such case it should be nil +// in IPConfig sets Interface index to 0. In such case it should be nil func fixInterfaces(rObj cnitypes.Result) (cnitypes.Result, error) { result, err := current.NewResultFromResult(rObj) if err != nil { diff --git a/multus/multus_test.go b/multus/multus_test.go index 7fbc66466..f24d86335 100644 --- a/multus/multus_test.go +++ b/multus/multus_test.go @@ -27,7 +27,7 @@ import ( "github.com/containernetworking/cni/pkg/skel" cnitypes "github.com/containernetworking/cni/pkg/types" - "github.com/containernetworking/cni/pkg/types/020" + types020 "github.com/containernetworking/cni/pkg/types/020" cniversion "github.com/containernetworking/cni/pkg/version" "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" @@ -227,7 +227,7 @@ var _ = Describe("multus operations", func() { result, err := cmdAdd(args, fExec, nil) Expect(err).NotTo(HaveOccurred()) Expect(fExec.addIndex).To(Equal(len(fExec.plugins))) - r := result.(*types020.Result) + r, _ := result.GetAsVersion("0.2.0") // plugin 1 is the masterplugin Expect(reflect.DeepEqual(r, expectedResult1)).To(BeTrue()) @@ -319,7 +319,7 @@ var _ = Describe("multus operations", func() { Expect(fExec.addIndex).To(Equal(len(fExec.plugins))) Expect(fKubeClient.PodCount).To(Equal(3)) Expect(fKubeClient.NetCount).To(Equal(2)) - r := result.(*types020.Result) + r, _ := result.GetAsVersion("0.2.0") // plugin 1 is the masterplugin Expect(reflect.DeepEqual(r, expectedResult1)).To(BeTrue()) }) @@ -398,7 +398,7 @@ var _ = Describe("multus operations", func() { Expect(fExec.addIndex).To(Equal(len(fExec.plugins))) Expect(fKubeClient.PodCount).To(Equal(3)) Expect(fKubeClient.NetCount).To(Equal(2)) - r := result.(*types020.Result) + r, _ := result.GetAsVersion("0.2.0") // plugin 1 is the masterplugin Expect(reflect.DeepEqual(r, expectedResult1)).To(BeTrue()) })