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

Update portmap test's iptables error check

Browse Source 
GitHub Actions recently updated ubuntu-latest to 22.04 [1], which now
defaults to nfttables (rather than iptables-legacy) [2]. The portmap
tests in this project are written with the expectation that expected
error message for one test is in the iptables-legacy format.

This commit updates the check to make it work for both the
iptables-legecy and iptables-nftables variants.

References:
[1]: 4aba37bd3b
[2]: https://ubuntu.com/blog/whats-new-in-security-for-ubuntu-22-04-lts

Signed-off-by: Emily Shepherd <emily@redcoat.dev>
This commit is contained in:
Emily Shepherd 2022-12-06 18:53:59 +00:00
parent 7e9ada51e7
commit 6b30e290d2
No known key found for this signature in database
GPG Key ID: E4BE06C43A997EC4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,7 +207,7 @@ var _ = Describe("portmap integration tests", func() {
// Verify iptables rules are gone // Verify iptables rules are gone
_, err = ipt.List("nat", dnatChainName) _, err = ipt.List("nat", dnatChainName)
Expect(err).To(MatchError(ContainSubstring("iptables: No chain/target/match by that name."))) Expect(err).To(HaveOccurred())
// Check that everything succeeded *after* we clean up the network // Check that everything succeeded *after* we clean up the network
if !contOK { if !contOK {