mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
integration-cli: SA5011: possible nil pointer dereference (staticcheck)
I think the original intent here was to make passing t optional (62a856e912
),
but it looks like that's not done anywhere, so let's remove it.
integration-cli/docker_utils_test.go:81:2: SA5011: possible nil pointer dereference (staticcheck)
c.Helper()
^
integration-cli/docker_utils_test.go:84:5: SA5011(related information): this check suggests that the pointer can be nil (staticcheck)
if c != nil {
^
integration-cli/docker_utils_test.go:106:2: SA5011: possible nil pointer dereference (staticcheck)
c.Helper()
^
integration-cli/docker_utils_test.go:108:5: SA5011(related information): this check suggests that the pointer can be nil (staticcheck)
if c != nil {
^
integration-cli/docker_utils_test.go:116:2: SA5011: possible nil pointer dereference (staticcheck)
c.Helper()
^
integration-cli/docker_utils_test.go:118:5: SA5011(related information): this check suggests that the pointer can be nil (staticcheck)
if c != nil {
^
integration-cli/docker_utils_test.go:126:2: SA5011: possible nil pointer dereference (staticcheck)
c.Helper()
^
integration-cli/docker_utils_test.go:128:5: SA5011(related information): this check suggests that the pointer can be nil (staticcheck)
if c != nil {
^
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
85ed9b8746
commit
89f63f476b
1 changed files with 4 additions and 12 deletions
|
@ -81,9 +81,7 @@ func inspectFieldAndUnmarshall(c *testing.T, name, field string, output interfac
|
|||
c.Helper()
|
||||
str := inspectFieldJSON(c, name, field)
|
||||
err := json.Unmarshal([]byte(str), output)
|
||||
if c != nil {
|
||||
assert.Assert(c, err == nil, "failed to unmarshal: %v", err)
|
||||
}
|
||||
assert.Assert(c, err == nil, "failed to unmarshal: %v", err)
|
||||
}
|
||||
|
||||
// Deprecated: use cli.Inspect
|
||||
|
@ -105,9 +103,7 @@ func inspectFieldWithError(name, field string) (string, error) {
|
|||
func inspectField(c *testing.T, name, field string) string {
|
||||
c.Helper()
|
||||
out, err := inspectFilter(name, fmt.Sprintf(".%s", field))
|
||||
if c != nil {
|
||||
assert.NilError(c, err)
|
||||
}
|
||||
assert.NilError(c, err)
|
||||
return out
|
||||
}
|
||||
|
||||
|
@ -115,9 +111,7 @@ func inspectField(c *testing.T, name, field string) string {
|
|||
func inspectFieldJSON(c *testing.T, name, field string) string {
|
||||
c.Helper()
|
||||
out, err := inspectFilter(name, fmt.Sprintf("json .%s", field))
|
||||
if c != nil {
|
||||
assert.NilError(c, err)
|
||||
}
|
||||
assert.NilError(c, err)
|
||||
return out
|
||||
}
|
||||
|
||||
|
@ -125,9 +119,7 @@ func inspectFieldJSON(c *testing.T, name, field string) string {
|
|||
func inspectFieldMap(c *testing.T, name, path, field string) string {
|
||||
c.Helper()
|
||||
out, err := inspectFilter(name, fmt.Sprintf("index .%s %q", path, field))
|
||||
if c != nil {
|
||||
assert.NilError(c, err)
|
||||
}
|
||||
assert.NilError(c, err)
|
||||
return out
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue