summaryrefslogtreecommitdiff
path: root/pkg/hooks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-04 13:51:27 +0200
committerGitHub <noreply@github.com>2019-07-04 13:51:27 +0200
commit1fe2965e4f672674f7b66648e9973a0ed5434bb4 (patch)
tree8d5385f5939ff3c139dc2e15b112ce4ad9797b1a /pkg/hooks
parent1de81bc71704f4a317756c866695740fb6f65a9b (diff)
parentfec1de6ef4b3f769ba0906cda948a3215709cd37 (diff)
downloadpodman-1fe2965e4f672674f7b66648e9973a0ed5434bb4.tar.gz
podman-1fe2965e4f672674f7b66648e9973a0ed5434bb4.tar.bz2
podman-1fe2965e4f672674f7b66648e9973a0ed5434bb4.zip
Merge pull request #3495 from baude/golandcodecleanup
trivial cleanups from golang
Diffstat (limited to 'pkg/hooks')
-rw-r--r--pkg/hooks/0.1.0/hook.go2
-rw-r--r--pkg/hooks/1.0.0/when_test.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/hooks/0.1.0/hook.go b/pkg/hooks/0.1.0/hook.go
index ba68b0f10..88a387647 100644
--- a/pkg/hooks/0.1.0/hook.go
+++ b/pkg/hooks/0.1.0/hook.go
@@ -6,7 +6,7 @@ import (
"errors"
"strings"
- hooks "github.com/containers/libpod/pkg/hooks"
+ "github.com/containers/libpod/pkg/hooks"
current "github.com/containers/libpod/pkg/hooks/1.0.0"
rspec "github.com/opencontainers/runtime-spec/specs-go"
)
diff --git a/pkg/hooks/1.0.0/when_test.go b/pkg/hooks/1.0.0/when_test.go
index 7187b297b..a749063ff 100644
--- a/pkg/hooks/1.0.0/when_test.go
+++ b/pkg/hooks/1.0.0/when_test.go
@@ -30,7 +30,7 @@ func TestAlways(t *testing.T) {
for _, always := range []bool{true, false} {
for _, or := range []bool{true, false} {
for _, process := range []*rspec.Process{processStruct, nil} {
- t.Run(fmt.Sprintf("always %t, or %t, has process %t", always, or, (process != nil)), func(t *testing.T) {
+ t.Run(fmt.Sprintf("always %t, or %t, has process %t", always, or, process != nil), func(t *testing.T) {
config.Process = process
when := When{Always: &always, Or: or}
match, err := when.Match(config, map[string]string{}, false)