kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

pkg/*: clean up a few issues

Browse source 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
This commit is contained in:
unclejack 2017-03-30 12:26:16 +03:00
parent 90a44b875c
commit a23c456e5a
9 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/ioutils/fswriters_test.go
View file

@ -37,7 +37,7 @@ func TestAtomicWriteToFile(t *testing.T) {
t.Fatalf("Error reading from file: %v", err)
}
if bytes.Compare(actual, expected) != 0 {
if !bytes.Equal(actual, expected) {
t.Fatalf("Data mismatch, expected %q, got %q", expected, actual)
}
@ -85,7 +85,7 @@ func TestAtomicWriteSetCommit(t *testing.T) {
t.Fatalf("Error reading from file: %v", err)
}
if bytes.Compare(actual, expected) != 0 {
if !bytes.Equal(actual, expected) {
t.Fatalf("Data mismatch, expected %q, got %q", expected, actual)
}

2
pkg/ioutils/multireader_test.go
View file

@ -193,7 +193,7 @@ func TestMultiReadSeekerCurAfterSet(t *testing.T) {
func TestMultiReadSeekerSmallReads(t *testing.T) {
readers := []io.ReadSeeker{}
for i := 0; i < 10; i++ {
integer := make([]byte, 4, 4)
integer := make([]byte, 4)
binary.BigEndian.PutUint32(integer, uint32(i))
readers = append(readers, bytes.NewReader(integer))
}

2
pkg/jsonlog/jsonlogbytes.go
View file

@ -30,7 +30,7 @@ func (mj *JSONLogs) MarshalJSONBuf(buf *bytes.Buffer) error {
ffjsonWriteJSONBytesAsString(buf, mj.Log)
}
if len(mj.Stream) != 0 {
if first == true {
if first {
first = false
} else {
buf.WriteString(`,`)

2
pkg/listeners/group_unix.go
View file

@ -23,7 +23,7 @@ func lookupGID(name string) (int, error) {
if err != nil {
return -1, errors.Wrapf(err, "error parsing groups for %s", name)
}
if groups != nil && len(groups) > 0 {
if len(groups) > 0 {
return groups[0].Gid, nil
}
gid, err := strconv.Atoi(name)

5
pkg/mount/mount.go
View file

@ -46,10 +46,7 @@ func Mount(device, target, mType, options string) error {
// flags.go for supported option flags.
func ForceMount(device, target, mType, options string) error {
flag, data := parseOptions(options)
if err := mount(device, target, mType, uintptr(flag), data); err != nil {
return err
}
return nil
return mount(device, target, mType, uintptr(flag), data)
}
// Unmount will unmount the target filesystem, so long as it is mounted.

2
pkg/plugins/discovery_test.go
View file

@ -66,7 +66,7 @@ func TestFileSpecPlugin(t *testing.T) {
t.Fatalf("Expected plugin addr `%s`, got %s\n", c.addr, p.Addr)
}
if p.TLSConfig.InsecureSkipVerify != true {
if !p.TLSConfig.InsecureSkipVerify {
t.Fatalf("Expected TLS verification to be skipped")
}
}

2
pkg/plugins/discovery_unix_test.go
View file

@ -53,7 +53,7 @@ func TestLocalSocket(t *testing.T) {
if p.Addr != addr {
t.Fatalf("Expected plugin addr `%s`, got %s\n", addr, p.Addr)
}
if p.TLSConfig.InsecureSkipVerify != true {
if !p.TLSConfig.InsecureSkipVerify {
t.Fatalf("Expected TLS verification to be skipped")
}
l.Close()

2
pkg/progress/progressreader_test.go
View file

@ -14,7 +14,7 @@ func TestOutputOnPrematureClose(t *testing.T) {
pr := NewProgressReader(reader, ChanOutput(progressChan), int64(len(content)), "Test", "Read")
part := make([]byte, 4, 4)
part := make([]byte, 4)
_, err := io.ReadFull(pr, part)
if err != nil {
pr.Close()

4
pkg/registrar/registrar.go
View file

@ -100,9 +100,7 @@ func (r *Registrar) GetNames(key string) ([]string, error) {
}
ls := make([]string, 0, len(names))
for _, n := range names {
ls = append(ls, n)
}
ls = append(ls, names...)
return ls, nil
}