github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vet fixes

Browse Source 
Signed-off-by: Jess Frazelle <me@jessfraz.com>
This commit is contained in:
Jess Frazelle
2016-08-15 14:02:47 -07:00
committed by Jess Frazelle
parent 3803fee972
commit d51962e1bb
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/security/apparmor/validate_test.go
View File

@@ -18,6 +18,7 @@ package apparmor
import (
"errors"
"fmt"
"testing"
"k8s.io/kubernetes/pkg/api"
@@ -73,7 +74,7 @@ func TestValidateProfile(t *testing.T) {
if test.expectValid {
assert.NoError(t, err, "Profile %s should be valid", test.profile)
} else {
assert.Error(t, err, "Profile %s should not be valid", test.profile)
assert.Error(t, err, fmt.Sprintf("Profile %s should not be valid", test.profile))
}
}
}
@@ -127,7 +128,7 @@ func TestValidateValidHost(t *testing.T) {
if test.expectValid {
assert.NoError(t, err, "Pod with profile %q should be valid", test.profile)
} else {
assert.Error(t, err, "Pod with profile %q should trigger a validation error", test.profile)
assert.Error(t, err, fmt.Sprintf("Pod with profile %q should trigger a validation error", test.profile))
}
}
@@ -154,7 +155,7 @@ func TestValidateValidHost(t *testing.T) {
assert.NoError(t, v.Validate(pod), "Multi-container pod should validate")
for k, val := range pod.Annotations {
pod.Annotations[k] = val + "-bad"
assert.Error(t, v.Validate(pod), "Multi-container pod with invalid profile %s:%s", k, pod.Annotations[k])
assert.Error(t, v.Validate(pod), fmt.Sprintf("Multi-container pod with invalid profile %s:%s", k, pod.Annotations[k]))
pod.Annotations[k] = val // Restore.
}
}