opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14605 from Luap99/update-golangci-lint

Browse Source 
golangci-lint: update to v1.46.2
This commit is contained in:
openshift-ci[bot]
2022-06-16 07:32:58 +00:00
committed by GitHub
parent 78c149ff91 21819254dd
commit a90dac9454
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.golangci.yml
View File

@ -55,6 +55,8 @@ linters:
- varnamelen - varnamelen
- maintidx - maintidx
- nilnil - nilnil
- nonamedreturns
- exhaustruct
# deprecated linters # deprecated linters
- golint # replaced by revive - golint # replaced by revive
- scopelint # replaced by exportloopref - scopelint # replaced by exportloopref

2
Makefile
View File

@ -829,7 +829,7 @@ install.tools: .install.ginkgo .install.golangci-lint .install.bats ## Install n
.PHONY: .install.golangci-lint .PHONY: .install.golangci-lint
.install.golangci-lint: .install.golangci-lint:
VERSION=1.45.2 ./hack/install_golangci.sh VERSION=1.46.2 ./hack/install_golangci.sh
.PHONY: .install.md2man .PHONY: .install.md2man
.install.md2man: .install.md2man:

8
test/e2e/systemd_activate_test.go
View File

@ -8,6 +8,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strconv"
"syscall" "syscall"
"time" "time"
@ -61,9 +62,10 @@ var _ = Describe("Systemd activate", func() {
host := "127.0.0.1" host := "127.0.0.1"
port, err := podmanUtils.GetRandomPort() port, err := podmanUtils.GetRandomPort()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
addr := net.JoinHostPort(host, strconv.Itoa(port))
activateSession := testUtils.StartSystemExec(activate, []string{ activateSession := testUtils.StartSystemExec(activate, []string{
fmt.Sprintf("--listen=%s:%d", host, port), "--listen", addr,
podmanTest.PodmanBinary, podmanTest.PodmanBinary,
"--root=" + filepath.Join(tempDir, "server_root"), "--root=" + filepath.Join(tempDir, "server_root"),
"system", "service", "system", "service",
@ -73,7 +75,7 @@ var _ = Describe("Systemd activate", func() {
// Curried functions for specialized podman calls // Curried functions for specialized podman calls
podmanRemote := func(args ...string) *testUtils.PodmanSession { podmanRemote := func(args ...string) *testUtils.PodmanSession {
args = append([]string{"--url", fmt.Sprintf("tcp://%s:%d", host, port)}, args...) args = append([]string{"--url", "tcp://" + addr}, args...)
return testUtils.SystemExec(podmanTest.RemotePodmanBinary, args) return testUtils.SystemExec(podmanTest.RemotePodmanBinary, args)
} }
@ -111,7 +113,7 @@ var _ = Describe("Systemd activate", func() {
port, err := podmanUtils.GetRandomPort() port, err := podmanUtils.GetRandomPort()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
addr := fmt.Sprintf("%s:%d", host, port) addr := net.JoinHostPort(host, strconv.Itoa(port))
// start systemd activation with datagram socket // start systemd activation with datagram socket
activateSession := testUtils.StartSystemExec(activate, []string{ activateSession := testUtils.StartSystemExec(activate, []string{