make lint: include unit tests

Include the unit tests (i.e., _test.go files) for linting to make the
tests more robust and enforce the linters' coding styles etc.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

7 files changed, 48 insertions, 31 deletions

diff --git a/pkg/apparmor/apparmor_linux_test.go b/pkg/apparmor/apparmor_linux_test.go
index e94293d87..3ff6e18bc 100644
--- a/pkg/apparmor/apparmor_linux_test.go
+++ b/pkg/apparmor/apparmor_linux_test.go
@@ -134,7 +134,7 @@ func TestDefaultContent(t *testing.T) {
 	if _, err := os.Stat(aapath); err != nil {
 		t.Skip("AppArmor isn't available in this environment")
 	}
-	if err := DefaultContent(profile); err != nil {
+	if _, err := DefaultContent(profile); err != nil {
 		t.Fatalf("Couldn't retrieve default AppArmor profile content '%s': %v", profile, err)
 	}
 }
diff --git a/pkg/hooks/1.0.0/when_test.go b/pkg/hooks/1.0.0/when_test.go
index a749063ff..94b0c3830 100644
--- a/pkg/hooks/1.0.0/when_test.go
+++ b/pkg/hooks/1.0.0/when_test.go
@@ -10,7 +10,8 @@ import (
 
 func TestNoMatch(t *testing.T) {
 	config := &rspec.Spec{}
-	for _, or := range []bool{true, false} {
+	for _, o := range []bool{true, false} {
+		or := o
 		t.Run(fmt.Sprintf("or %t", or), func(t *testing.T) {
 			when := When{Or: or}
 			match, err := when.Match(config, map[string]string{}, false)
@@ -27,9 +28,12 @@ func TestAlways(t *testing.T) {
 	processStruct := &rspec.Process{
 		Args: []string{"/bin/sh", "a", "b"},
 	}
-	for _, always := range []bool{true, false} {
-		for _, or := range []bool{true, false} {
-			for _, process := range []*rspec.Process{processStruct, nil} {
+	for _, a := range []bool{true, false} {
+		always := a
+		for _, o := range []bool{true, false} {
+			or := o
+			for _, p := range []*rspec.Process{processStruct, nil} {
+				process := p
 				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}
@@ -48,7 +52,8 @@ func TestHasBindMountsAnd(t *testing.T) {
 	hasBindMounts := true
 	when := When{HasBindMounts: &hasBindMounts}
 	config := &rspec.Spec{}
-	for _, containerHasBindMounts := range []bool{false, true} {
+	for _, b := range []bool{false, true} {
+		containerHasBindMounts := b
 		t.Run(fmt.Sprintf("%t", containerHasBindMounts), func(t *testing.T) {
 			match, err := when.Match(config, map[string]string{}, containerHasBindMounts)
 			if err != nil {
@@ -63,7 +68,8 @@ func TestHasBindMountsOr(t *testing.T) {
 	hasBindMounts := true
 	when := When{HasBindMounts: &hasBindMounts, Or: true}
 	config := &rspec.Spec{}
-	for _, containerHasBindMounts := range []bool{false, true} {
+	for _, b := range []bool{false, true} {
+		containerHasBindMounts := b
 		t.Run(fmt.Sprintf("%t", containerHasBindMounts), func(t *testing.T) {
 			match, err := when.Match(config, map[string]string{}, containerHasBindMounts)
 			if err != nil {
@@ -82,7 +88,7 @@ func TestAnnotations(t *testing.T) {
 		},
 	}
 	config := &rspec.Spec{}
-	for _, test := range []struct {
+	for _, tt := range []struct {
 		name        string
 		annotations map[string]string
 		or          bool
@@ -131,6 +137,7 @@ func TestAnnotations(t *testing.T) {
 			match: false,
 		},
 	} {
+		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			when.Or = test.or
 			match, err := when.Match(config, test.annotations, false)
@@ -149,7 +156,7 @@ func TestCommands(t *testing.T) {
 		},
 	}
 	config := &rspec.Spec{}
-	for _, test := range []struct {
+	for _, tt := range []struct {
 		name    string
 		process *rspec.Process
 		match   bool
@@ -173,6 +180,7 @@ func TestCommands(t *testing.T) {
 			match: false,
 		},
 	} {
+		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			config.Process = test.process
 			match, err := when.Match(config, map[string]string{}, false)
@@ -209,7 +217,7 @@ func TestHasBindMountsAndCommands(t *testing.T) {
 		},
 	}
 	config := &rspec.Spec{Process: &rspec.Process{}}
-	for _, test := range []struct {
+	for _, tt := range []struct {
 		name          string
 		command       string
 		hasBindMounts bool
@@ -273,6 +281,7 @@ func TestHasBindMountsAndCommands(t *testing.T) {
 			match:         false,
 		},
 	} {
+		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			config.Process.Args = []string{test.command}
 			when.Or = test.or
@@ -287,7 +296,7 @@ func TestHasBindMountsAndCommands(t *testing.T) {
 
 func TestInvalidRegexp(t *testing.T) {
 	config := &rspec.Spec{Process: &rspec.Process{Args: []string{"/bin/sh"}}}
-	for _, test := range []struct {
+	for _, tt := range []struct {
 		name     string
 		when     When
 		expected string
@@ -308,6 +317,7 @@ func TestInvalidRegexp(t *testing.T) {
 			expected: "^command: error parsing regexp: .*",
 		},
 	} {
+		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			_, err := test.when.Match(config, map[string]string{"a": "b"}, false)
 			if err == nil {
diff --git a/pkg/hooks/exec/exec_test.go b/pkg/hooks/exec/exec_test.go
index 7aac315cb..1e105373d 100644
--- a/pkg/hooks/exec/exec_test.go
+++ b/pkg/hooks/exec/exec_test.go
@@ -94,7 +94,7 @@ func TestRunEnvironment(t *testing.T) {
 		Path: path,
 		Args: []string{"sh", "-c", "env"},
 	}
-	for _, test := range []struct {
+	for _, tt := range []struct {
 		name     string
 		env      []string
 		expected map[string]string
@@ -120,6 +120,7 @@ func TestRunEnvironment(t *testing.T) {
 			},
 		},
 	} {
+		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			var stderr, stdout bytes.Buffer
 			hook.Env = test.env
@@ -147,7 +148,7 @@ func TestRunCancel(t *testing.T) {
 		Args: []string{"sh", "-c", "echo waiting; sleep 2; echo done"},
 	}
 	one := 1
-	for _, test := range []struct {
+	for _, tt := range []struct {
 		name              string
 		contextTimeout    time.Duration
 		hookTimeout       *int
@@ -174,6 +175,7 @@ func TestRunCancel(t *testing.T) {
 			expectedRunError:  context.DeadlineExceeded,
 		},
 	} {
+		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			ctx := context.Background()
 			var stderr, stdout bytes.Buffer
diff --git a/pkg/hooks/exec/runtimeconfigfilter_test.go b/pkg/hooks/exec/runtimeconfigfilter_test.go
index 52d590d14..48dd2f998 100644
--- a/pkg/hooks/exec/runtimeconfigfilter_test.go
+++ b/pkg/hooks/exec/runtimeconfigfilter_test.go
@@ -25,9 +25,9 @@ func pointerFileMode(value os.FileMode) *os.FileMode {
 }
 
 func TestRuntimeConfigFilter(t *testing.T) {
-	unexpectedEndOfJSONInput := json.Unmarshal([]byte("{\n"), nil)
+	unexpectedEndOfJSONInput := json.Unmarshal([]byte("{\n"), nil) //nolint
 
-	for _, test := range []struct {
+	for _, tt := range []struct {
 		name              string
 		contextTimeout    time.Duration
 		hooks             []spec.Hook
@@ -244,6 +244,7 @@ func TestRuntimeConfigFilter(t *testing.T) {
 			expectedRunError: unexpectedEndOfJSONInput,
 		},
 	} {
+		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			ctx := context.Background()
 			if test.contextTimeout > 0 {
diff --git a/pkg/network/network_test.go b/pkg/network/network_test.go
index dbffc33ad..1969e792c 100644
--- a/pkg/network/network_test.go
+++ b/pkg/network/network_test.go
@@ -25,9 +25,10 @@ func Test_networkIntersect(t *testing.T) {
 		{"Two 24s", args{n1: parseCIDR("192.168.1.0/24"), n2: parseCIDR("192.168.2.0/24")}, false},
 	}
 	for _, tt := range tests {
+		test := tt
 		t.Run(tt.name, func(t *testing.T) {
-			if got := networkIntersect(tt.args.n1, tt.args.n2); got != tt.want {
-				t.Errorf("networkIntersect() = %v, want %v", got, tt.want)
+			if got := networkIntersect(test.args.n1, test.args.n2); got != test.want {
+				t.Errorf("networkIntersect() = %v, want %v", got, test.want)
 			}
 		})
 	}
diff --git a/pkg/network/subnet_test.go b/pkg/network/subnet_test.go
index 6ecfd2d17..917c3be88 100644
--- a/pkg/network/subnet_test.go
+++ b/pkg/network/subnet_test.go
@@ -20,14 +20,15 @@ func TestNextSubnet(t *testing.T) {
 		{"class c", args{subnet: parseCIDR("192.168.1.0/24")}, parseCIDR("192.168.2.0/24"), false},
 	}
 	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := NextSubnet(tt.args.subnet)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("NextSubnet() error = %v, wantErr %v", err, tt.wantErr)
+		test := tt
+		t.Run(test.name, func(t *testing.T) {
+			got, err := NextSubnet(test.args.subnet)
+			if (err != nil) != test.wantErr {
+				t.Errorf("NextSubnet() error = %v, wantErr %v", err, test.wantErr)
 				return
 			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("NextSubnet() got = %v, want %v", got, tt.want)
+			if !reflect.DeepEqual(got, test.want) {
+				t.Errorf("NextSubnet() got = %v, want %v", got, test.want)
 			}
 		})
 	}
diff --git a/pkg/systemdgen/systemdgen_test.go b/pkg/systemdgen/systemdgen_test.go
index e1da7e8e0..3894a0205 100644
--- a/pkg/systemdgen/systemdgen_test.go
+++ b/pkg/systemdgen/systemdgen_test.go
@@ -24,9 +24,10 @@ func TestValidateRestartPolicy(t *testing.T) {
 		{"failblank", ContainerInfo{restart: ""}, true},
 	}
 	for _, tt := range tests {
+		test := tt
 		t.Run(tt.name, func(t *testing.T) {
-			if err := validateRestartPolicy(tt.ContainerInfo.restart); (err != nil) != tt.wantErr {
-				t.Errorf("ValidateRestartPolicy() error = %v, wantErr %v", err, tt.wantErr)
+			if err := validateRestartPolicy(test.ContainerInfo.restart); (err != nil) != test.wantErr {
+				t.Errorf("ValidateRestartPolicy() error = %v, wantErr %v", err, test.wantErr)
 			}
 		})
 	}
@@ -221,18 +222,19 @@ WantedBy=multi-user.target`
 		},
 	}
 	for _, tt := range tests {
+		test := tt
 		t.Run(tt.name, func(t *testing.T) {
 			opts := Options{
 				Files: false,
-				New:   tt.info.New,
+				New:   test.info.New,
 			}
-			got, err := CreateContainerSystemdUnit(&tt.info, opts)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("CreateContainerSystemdUnit() error = \n%v, wantErr \n%v", err, tt.wantErr)
+			got, err := CreateContainerSystemdUnit(&test.info, opts)
+			if (err != nil) != test.wantErr {
+				t.Errorf("CreateContainerSystemdUnit() error = \n%v, wantErr \n%v", err, test.wantErr)
 				return
 			}
-			if got != tt.want {
-				t.Errorf("CreateContainerSystemdUnit() = \n%v\n---------> want\n%v", got, tt.want)
+			if got != test.want {
+				t.Errorf("CreateContainerSystemdUnit() = \n%v\n---------> want\n%v", got, test.want)
 			}
 		})
 	}