GitList

Browse code

pkg/*: clean up a few issues

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

unclejack authored on 2017/03/30 18:26:16
Showing 9 changed files

pkg/ioutils/fswriters_test.go index c4d1419..5d28600 100644
pkg/ioutils/multireader_test.go index 65309a9..86ce47a 100644
pkg/jsonlog/jsonlogbytes.go index df522c0..0ba716f 100644
pkg/listeners/group_unix.go index c487079..e1d8774 100644
pkg/mount/mount.go index 66ac4bf..bb4cd88 100644
pkg/plugins/discovery_test.go index 03f9d00..1a23faa 100644
pkg/plugins/discovery_unix_test.go index 3e2d506..1b232b7 100644
pkg/progress/progressreader_test.go index b14d401..690e705 100644
pkg/registrar/registrar.go index 803b0d3..df12db7 100644

@@ -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)
 	}
 

pkg/ioutils/multireader_test.go

History View file @ a23c456

@@ -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))
+                     	}

pkg/jsonlog/jsonlogbytes.go

History View file @ a23c456

@@ -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(`,`)

pkg/listeners/group_unix.go

History View file @ a23c456

@@ -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)

pkg/mount/mount.go

History View file @ a23c456

@@ -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.

pkg/plugins/discovery_test.go

History View file @ a23c456

@@ -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")
 		}
 	}

pkg/plugins/discovery_unix_test.go

History View file @ a23c456

@@ -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()

pkg/progress/progressreader_test.go

History View file @ a23c456

@@ -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()

pkg/registrar/registrar.go

History View file @ a23c456

@@ -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
 }
 

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

...	...	@@ -37,7 +37,7 @@ func TestAtomicWriteToFile(t *testing.T) {
37	37	t.Fatalf("Error reading from file: %v", err)
38	38	}
39	39
40		- if bytes.Compare(actual, expected) != 0 {
	40	+ if !bytes.Equal(actual, expected) {
41	41	t.Fatalf("Data mismatch, expected %q, got %q", expected, actual)
42	42	}
43	43
...	...	@@ -85,7 +85,7 @@ func TestAtomicWriteSetCommit(t *testing.T) {
85	85	t.Fatalf("Error reading from file: %v", err)
86	86	}
87	87
88		- if bytes.Compare(actual, expected) != 0 {
	88	+ if !bytes.Equal(actual, expected) {
89	89	t.Fatalf("Data mismatch, expected %q, got %q", expected, actual)
90	90	}
91	91

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

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

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