Skip to content

Commit f08cd44

Browse files
LK4D4vieux
LK4D4
authored and
vieux
committed
Fix go vet errors
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4) Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
1 parent f0ec901 commit f08cd44

File tree

12 files changed

+27
-25
lines changed

12 files changed

+27
-25
lines changed

‎api/client/commands.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (cli *DockerCli) CmdHelp(args ...string) error {
9191

9292
// FIXME: 'insert' is deprecated.
9393
func (cli *DockerCli) CmdInsert(args ...string) error {
94-
fmt.Fprintf(os.Stderr, "Warning: '%s' is deprecated and will be removed in a future version. Please use 'docker build' and 'ADD' instead.\n")
94+
fmt.Fprintf(os.Stderr, "Warning: 'insert' is deprecated and will be removed in a future version. Please use 'docker build' and 'ADD' instead.\n")
9595
cmd := cli.Subcmd("insert", "IMAGE URL PATH", "Insert a file from URL in the IMAGE at PATH")
9696
if err := cmd.Parse(args); err != nil {
9797
return nil

‎archive/archive_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,6 @@ func TestUntarUstarGnuConflict(t *testing.T) {
164164
}
165165
}
166166
if !found {
167-
t.Fatal("%s not found in the archive", "root/.cpanm/work/1395823785.24209/Plack-1.0030/blib/man3/Plack::Middleware::LighttpdScriptNameFix.3pm")
167+
t.Fatalf("%s not found in the archive", "root/.cpanm/work/1395823785.24209/Plack-1.0030/blib/man3/Plack::Middleware::LighttpdScriptNameFix.3pm")
168168
}
169169
}

‎daemon/graphdriver/devmapper/deviceset.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ type DevInfo struct {
5555
}
5656

5757
type MetaData struct {
58-
Devices map[string]*DevInfo `json:devices`
58+
Devices map[string]*DevInfo `json:"Devices"`
5959
devicesLock sync.Mutex `json:"-"` // Protects all read/writes to Devices map
6060
}
6161

‎daemon/graphdriver/graphtest/graphtest.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package graphtest
22

33
import (
4-
"github.com/dotcloud/docker/daemon/graphdriver"
54
"io/ioutil"
65
"os"
76
"path"
87
"syscall"
98
"testing"
9+
10+
"github.com/dotcloud/docker/daemon/graphdriver"
1011
)
1112

1213
var (
@@ -94,10 +95,10 @@ func verifyFile(t *testing.T, path string, mode os.FileMode, uid, gid uint32) {
9495

9596
if stat, ok := fi.Sys().(*syscall.Stat_t); ok {
9697
if stat.Uid != uid {
97-
t.Fatal("%s no owned by uid %d", path, uid)
98+
t.Fatalf("%s no owned by uid %d", path, uid)
9899
}
99100
if stat.Gid != gid {
100-
t.Fatal("%s not owned by gid %d", path, gid)
101+
t.Fatalf("%s not owned by gid %d", path, gid)
101102
}
102103
}
103104

‎engine/streams_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func TestOutputAdd(t *testing.T) {
141141
t.Fatalf("Expected %d, got %d", len(input), n)
142142
}
143143
if output := b.String(); output != input {
144-
t.Fatal("Received wrong data from Add.\nExpected: '%s'\nGot: '%s'", input, output)
144+
t.Fatalf("Received wrong data from Add.\nExpected: '%s'\nGot: '%s'", input, output)
145145
}
146146
}
147147

‎engine/table.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,5 +137,4 @@ func (t *Table) ReadFrom(src io.Reader) (n int64, err error) {
137137
}
138138
t.Add(env)
139139
}
140-
return 0, nil
141140
}

‎integration-cli/docker_cli_images_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,30 @@ func TestCLIImageTagRemove(t *testing.T) {
2727
{
2828
imagesAfter, _, _ := cmd(t, "images", "-a")
2929
if nLines(imagesAfter) != nLines(imagesBefore)+3 {
30-
t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
30+
t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
3131
}
3232
}
3333
cmd(t, "rmi", "utest/docker:tag2")
3434
{
3535
imagesAfter, _, _ := cmd(t, "images", "-a")
3636
if nLines(imagesAfter) != nLines(imagesBefore)+2 {
37-
t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
37+
t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
3838
}
3939

4040
}
4141
cmd(t, "rmi", "utest:5000/docker:tag3")
4242
{
4343
imagesAfter, _, _ := cmd(t, "images", "-a")
4444
if nLines(imagesAfter) != nLines(imagesBefore)+1 {
45-
t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
45+
t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
4646
}
4747

4848
}
4949
cmd(t, "rmi", "utest:tag1")
5050
{
5151
imagesAfter, _, _ := cmd(t, "images", "-a")
5252
if nLines(imagesAfter) != nLines(imagesBefore)+0 {
53-
t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
53+
t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
5454
}
5555

5656
}

‎integration-cli/docker_cli_run_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -450,32 +450,32 @@ func TestVolumeWithSymlink(t *testing.T) {
450450
buildCmd.Dir = buildDirectory
451451
err := buildCmd.Run()
452452
if err != nil {
453-
t.Fatal("could not build 'docker-test-volumewithsymlink': %v", err)
453+
t.Fatalf("could not build 'docker-test-volumewithsymlink': %v", err)
454454
}
455455

456456
cmd := exec.Command(dockerBinary, "run", "-v", "/bar/foo", "--name", "test-volumewithsymlink", "docker-test-volumewithsymlink", "sh", "-c", "mount | grep -q /foo/foo")
457457
exitCode, err := runCommand(cmd)
458458
if err != nil || exitCode != 0 {
459-
t.Fatal("[run] err: %v, exitcode: %d", err, exitCode)
459+
t.Fatalf("[run] err: %v, exitcode: %d", err, exitCode)
460460
}
461461

462462
var volPath string
463463
cmd = exec.Command(dockerBinary, "inspect", "-f", "{{range .Volumes}}{{.}}{{end}}", "test-volumewithsymlink")
464464
volPath, exitCode, err = runCommandWithOutput(cmd)
465465
if err != nil || exitCode != 0 {
466-
t.Fatal("[inspect] err: %v, exitcode: %d", err, exitCode)
466+
t.Fatalf("[inspect] err: %v, exitcode: %d", err, exitCode)
467467
}
468468

469469
cmd = exec.Command(dockerBinary, "rm", "-v", "test-volumewithsymlink")
470470
exitCode, err = runCommand(cmd)
471471
if err != nil || exitCode != 0 {
472-
t.Fatal("[rm] err: %v, exitcode: %d", err, exitCode)
472+
t.Fatalf("[rm] err: %v, exitcode: %d", err, exitCode)
473473
}
474474

475475
f, err := os.Open(volPath)
476476
defer f.Close()
477477
if !os.IsNotExist(err) {
478-
t.Fatal("[open] (expecting 'file does not exist' error) err: %v, volPath: %s", err, volPath)
478+
t.Fatalf("[open] (expecting 'file does not exist' error) err: %v, volPath: %s", err, volPath)
479479
}
480480

481481
deleteImages("docker-test-volumewithsymlink")

‎pkg/graphdb/graphdb_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package graphdb
22

33
import (
4-
_ "code.google.com/p/gosqlite/sqlite3"
54
"database/sql"
65
"fmt"
76
"os"
87
"path"
98
"strconv"
109
"testing"
10+
11+
_ "code.google.com/p/gosqlite/sqlite3"
1112
)
1213

1314
func newTestDb(t *testing.T) (*Database, string) {
@@ -535,6 +536,6 @@ func TestConcurrentWrites(t *testing.T) {
535536
}
536537
}
537538
if any {
538-
t.Fatal()
539+
t.Fail()
539540
}
540541
}

‎pkg/mflag/example/example.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func main() {
2828
flag.PrintDefaults()
2929
} else {
3030
fmt.Printf("s/#hidden/-string: %s\n", str)
31-
fmt.Printf("b: %b\n", b)
32-
fmt.Printf("-bool: %b\n", b2)
31+
fmt.Printf("b: %t\n", b)
32+
fmt.Printf("-bool: %t\n", b2)
3333
fmt.Printf("s/#hidden/-string(via lookup): %s\n", flag.Lookup("s").Value.String())
3434
fmt.Printf("ARGS: %v\n", flag.Args())
3535
}

0 commit comments

Comments
 (0)