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

plugins: cleanup tests of no-op plugin

Browse Source
This commit is contained in:
Gabe Rosenhouse 2016-07-22 13:30:55 -07:00
parent bacdc3668d
commit c657c61767
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/test/noop/noop_test.go
View File

@ -32,12 +32,13 @@ var _ = Describe("No-op plugin", func() {
cmd *exec.Cmd cmd *exec.Cmd
debugFileName string debugFileName string
debug *noop_debug.Debug debug *noop_debug.Debug
expectedCmdArgs skel.CmdArgs
) )
const reportResult = `{ "ip4": { "ip": "10.1.2.3/24" }, "dns": {} }`
BeforeEach(func() { BeforeEach(func() {
debug = &noop_debug.Debug{ debug = &noop_debug.Debug{ReportResult: reportResult}
ReportResult: `{ "ip4": { "ip": "10.1.2.3/24" }, "dns": {} }`,
}
debugFile, err := ioutil.TempFile("", "cni_debug") debugFile, err := ioutil.TempFile("", "cni_debug")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -50,12 +51,20 @@ var _ = Describe("No-op plugin", func() {
cmd.Env = []string{ cmd.Env = []string{
"CNI_COMMAND=ADD", "CNI_COMMAND=ADD",
"CNI_CONTAINERID=some-container-id", "CNI_CONTAINERID=some-container-id",
"CNI_ARGS=DEBUG=" + debugFile.Name(), "CNI_ARGS=DEBUG=" + debugFileName,
"CNI_NETNS=/some/netns/path", "CNI_NETNS=/some/netns/path",
"CNI_IFNAME=some-eth0", "CNI_IFNAME=some-eth0",
"CNI_PATH=/some/bin/path", "CNI_PATH=/some/bin/path",
} }
cmd.Stdin = strings.NewReader(`{"some":"stdin-json"}`) cmd.Stdin = strings.NewReader(`{"some":"stdin-json"}`)
expectedCmdArgs = skel.CmdArgs{
ContainerID: "some-container-id",
Netns: "/some/netns/path",
IfName: "some-eth0",
Args: "DEBUG=" + debugFileName,
Path: "/some/bin/path",
StdinData: []byte(`{"some":"stdin-json"}`),
}
}) })
AfterEach(func() { AfterEach(func() {
@ -66,10 +75,7 @@ var _ = Describe("No-op plugin", func() {
session, err := gexec.Start(cmd, GinkgoWriter, GinkgoWriter) session, err := gexec.Start(cmd, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Eventually(session).Should(gexec.Exit(0)) Eventually(session).Should(gexec.Exit(0))
Expect(session.Out.Contents()).To(MatchJSON(`{ Expect(session.Out.Contents()).To(MatchJSON(reportResult))
"ip4": { "ip": "10.1.2.3/24" },
"dns": {}
}`))
}) })
It("records all the args provided by skel.PluginMain", func() { It("records all the args provided by skel.PluginMain", func() {
@ -80,14 +86,7 @@ var _ = Describe("No-op plugin", func() {
debug, err := noop_debug.ReadDebug(debugFileName) debug, err := noop_debug.ReadDebug(debugFileName)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(debug.Command).To(Equal("ADD")) Expect(debug.Command).To(Equal("ADD"))
Expect(debug.CmdArgs).To(Equal(skel.CmdArgs{ Expect(debug.CmdArgs).To(Equal(expectedCmdArgs))
ContainerID: "some-container-id",
Netns: "/some/netns/path",
IfName: "some-eth0",
Args: "DEBUG=" + debugFileName,
Path: "/some/bin/path",
StdinData: []byte(`{"some":"stdin-json"}`),
}))
}) })
Context("when the ReportError debug field is set", func() { Context("when the ReportError debug field is set", func() {
@ -121,14 +120,7 @@ var _ = Describe("No-op plugin", func() {
debug, err := noop_debug.ReadDebug(debugFileName) debug, err := noop_debug.ReadDebug(debugFileName)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(debug.Command).To(Equal("DEL")) Expect(debug.Command).To(Equal("DEL"))
Expect(debug.CmdArgs).To(Equal(skel.CmdArgs{ Expect(debug.CmdArgs).To(Equal(expectedCmdArgs))
ContainerID: "some-container-id",
Netns: "/some/netns/path",
IfName: "some-eth0",
Args: "DEBUG=" + debugFileName,
Path: "/some/bin/path",
StdinData: []byte(`{"some":"stdin-json"}`),
}))
}) })
}) })