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

fix portmap port forward flakiness

Browse Source 
Use a Describe container for the It code block of the
portmap port forward integration test.

Signed-off-by: Antonio Ojea <antonio.ojea.garcia@gmail.com>
This commit is contained in:
Antonio Ojea
2019-12-11 19:00:26 +01:00
parent 6551165853
commit d8b1289098
1 changed files with 111 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/meta/portmap/portmap_integ_test.go
View File

@ -96,6 +96,7 @@ var _ = Describe("portmap integration tests", func() {
} }
}) })
Describe("Creating an interface in a namespace with the ptp plugin", func() {
// This needs to be done using Ginkgo's asynchronous testing mode. // This needs to be done using Ginkgo's asynchronous testing mode.
It("forwards a TCP port on ipv4", func(done Done) { It("forwards a TCP port on ipv4", func(done Done) {
var err error var err error
@ -171,6 +172,18 @@ var _ = Describe("portmap integration tests", func() {
cmd.Stdout = GinkgoWriter cmd.Stdout = GinkgoWriter
Expect(cmd.Run()).To(Succeed()) Expect(cmd.Run()).To(Succeed())
// dump ip routes output for debugging
cmd = exec.Command("ip", "route")
cmd.Stderr = GinkgoWriter
cmd.Stdout = GinkgoWriter
Expect(cmd.Run()).To(Succeed())
// dump ip addresses output for debugging
cmd = exec.Command("ip", "addr")
cmd.Stderr = GinkgoWriter
cmd.Stdout = GinkgoWriter
Expect(cmd.Run()).To(Succeed())
// Sanity check: verify that the container is reachable directly // Sanity check: verify that the container is reachable directly
contOK := testEchoServer(contIP.String(), containerPort, "") contOK := testEchoServer(contIP.String(), containerPort, "")
@ -210,6 +223,7 @@ var _ = Describe("portmap integration tests", func() {
}, TIMEOUT*9) }, TIMEOUT*9)
}) })
})
// testEchoServer returns true if we found an echo server on the port // testEchoServer returns true if we found an echo server on the port
func testEchoServer(address string, port int, netns string) bool { func testEchoServer(address string, port int, netns string) bool {