toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace fmt.Errorf() with errors.Errorf() in the cli

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin
2017-03-09 13:23:45 -05:00
parent c1b2fad9aa
commit e9d6193dfd
99 changed files with 370 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
command/volume/create_test.go
+7 -7
View File
@@ -2,7 +2,6 @@ package volume
import (
"bytes"
"fmt"
"io/ioutil"
"strings"
"testing"
@@ -11,6 +10,7 @@ import (
volumetypes "github.com/docker/docker/api/types/volume"
"github.com/docker/docker/cli/internal/test"
"github.com/docker/docker/pkg/testutil/assert"
"github.com/pkg/errors"
)
func TestVolumeCreateErrors(t *testing.T) {
@@ -33,7 +33,7 @@ func TestVolumeCreateErrors(t *testing.T) {
},
{
volumeCreateFunc: func(createBody volumetypes.VolumesCreateBody) (types.Volume, error) {
return types.Volume{}, fmt.Errorf("error creating volume")
return types.Volume{}, errors.Errorf("error creating volume")
},
expectedError: "error creating volume",
},
@@ -60,7 +60,7 @@ func TestVolumeCreateWithName(t *testing.T) {
cli := test.NewFakeCli(&fakeClient{
volumeCreateFunc: func(body volumetypes.VolumesCreateBody) (types.Volume, error) {
if body.Name != name {
return types.Volume{}, fmt.Errorf("expected name %q, got %q", name, body.Name)
return types.Volume{}, errors.Errorf("expected name %q, got %q", name, body.Name)
}
return types.Volume{
Name: body.Name,
@@ -98,16 +98,16 @@ func TestVolumeCreateWithFlags(t *testing.T) {
cli := test.NewFakeCli(&fakeClient{
volumeCreateFunc: func(body volumetypes.VolumesCreateBody) (types.Volume, error) {
if body.Name != "" {
return types.Volume{}, fmt.Errorf("expected empty name, got %q", body.Name)
return types.Volume{}, errors.Errorf("expected empty name, got %q", body.Name)
}
if body.Driver != expectedDriver {
return types.Volume{}, fmt.Errorf("expected driver %q, got %q", expectedDriver, body.Driver)
return types.Volume{}, errors.Errorf("expected driver %q, got %q", expectedDriver, body.Driver)
}
if !compareMap(body.DriverOpts, expectedOpts) {
return types.Volume{}, fmt.Errorf("expected drivers opts %v, got %v", expectedOpts, body.DriverOpts)
return types.Volume{}, errors.Errorf("expected drivers opts %v, got %v", expectedOpts, body.DriverOpts)
}
if !compareMap(body.Labels, expectedLabels) {
return types.Volume{}, fmt.Errorf("expected labels %v, got %v", expectedLabels, body.Labels)
return types.Volume{}, errors.Errorf("expected labels %v, got %v", expectedLabels, body.Labels)
}
return types.Volume{
Name: name,