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

Merge pull request #883 from mmorel-35/linter-2

Browse Source 
enable govet and unparam linters
This commit is contained in:
Casey Callendrello
2023-04-24 17:42:55 +02:00
committed by GitHub
parent 00b82fb666 10ddd9e454
commit 65fe256058
11 changed files with 61 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,8 +83,7 @@ var _ = Describe("portmap integration tests", func() {
fmt.Fprintln(GinkgoWriter, "namespace:", targetNS.Path())
// Start an echo server and get the port
containerPort, session, err = StartEchoServerInNamespace(targetNS)
Expect(err).NotTo(HaveOccurred())
containerPort, session = StartEchoServerInNamespace(targetNS)
})
AfterEach(func() {
@ -329,8 +328,7 @@ var _ = Describe("portmap integration tests", func() {
fmt.Fprintln(GinkgoWriter, "namespace:", targetNS2.Path())
// Start an echo server and get the port
containerPort, session2, err := StartEchoServerInNamespace(targetNS2)
Expect(err).NotTo(HaveOccurred())
containerPort, session2 := StartEchoServerInNamespace(targetNS2)
runtimeConfig2 := libcni.RuntimeConf{
ContainerID: fmt.Sprintf("unit-test2-%d", hostPort),

4
plugins/meta/portmap/portmap_suite_test.go
View File

@ -62,7 +62,7 @@ func startInNetNS(binPath string, netNS ns.NetNS) (*gexec.Session, error) {
return session, err
}
func StartEchoServerInNamespace(netNS ns.NetNS) (int, *gexec.Session, error) {
func StartEchoServerInNamespace(netNS ns.NetNS) (int, *gexec.Session) {
session, err := startInNetNS(echoServerBinaryPath, netNS)
Expect(err).NotTo(HaveOccurred())
@ -73,5 +73,5 @@ func StartEchoServerInNamespace(netNS ns.NetNS) (int, *gexec.Session, error) {
port, err := strconv.Atoi(portString)
Expect(err).NotTo(HaveOccurred())
return port, session, nil
return port, session
}