small fixes suggested in code review

eikenb · eikenb · commit fdad088de88a · 2019-02-04T13:21:47.000-08:00
needless use of empty byte slice (left over from earlier work) plus a couple tweaks to tests/asserts thanks @puellanivis for the review
diff --git a/request-example.go b/request-example.go
@@ -214,7 +214,6 @@ func newMemFile(name string, isdir bool) *memFile {
 		name:    name,
 		modtime: time.Now(),
 		isdir:   isdir,
-		content: []byte(""),
 	}
 }
 
diff --git a/request-server_test.go b/request-server_test.go
@@ -147,7 +147,7 @@ func TestRequestWriteEmpty(t *testing.T) {
 	f, err := r.fetch("/foo")
 	if assert.Nil(t, err) {
 		assert.False(t, f.isdir)
-		assert.Equal(t, []byte(""), f.content)
+		assert.Len(t, f.content, 0)
 	}
 	// lets test with an error
 	r.returnErr(os.ErrInvalid)
@@ -351,8 +351,8 @@ func TestRequestReaddir(t *testing.T) {
 	for i := 0; i < 100; i++ {
 		fname := fmt.Sprintf("/foo_%02d", i)
 		_, err := putTestFile(p.cli, fname, fname)
-		if !assert.NoError(t, err) {
-			t.Fatal(err)
+		if err != nil {
+			t.Fatal("expected no error, got:", err)
 		}
 	}
 	_, err := p.cli.ReadDir("/foo_01")

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,6 @@ func newMemFile(name string, isdir bool) *memFile {`
`214`	`214`	`name: name,`
`215`	`215`	`modtime: time.Now(),`
`216`	`216`	`isdir: isdir,`
`217`		`- content: []byte(""),`
`218`	`217`	`}`
`219`	`218`	`}`
`220`	`219`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ func TestRequestWriteEmpty(t *testing.T) {`
`147`	`147`	`f, err := r.fetch("/foo")`
`148`	`148`	`if assert.Nil(t, err) {`
`149`	`149`	`assert.False(t, f.isdir)`
`150`		`- assert.Equal(t, []byte(""), f.content)`
	`150`	`+ assert.Len(t, f.content, 0)`
`151`	`151`	`}`
`152`	`152`	`// lets test with an error`
`153`	`153`	`r.returnErr(os.ErrInvalid)`
`@@ -351,8 +351,8 @@ func TestRequestReaddir(t *testing.T) {`
`351`	`351`	`for i := 0; i < 100; i++ {`
`352`	`352`	`fname := fmt.Sprintf("/foo_%02d", i)`
`353`	`353`	`_, err := putTestFile(p.cli, fname, fname)`
`354`		`- if !assert.NoError(t, err) {`
`355`		`- t.Fatal(err)`
	`354`	`+ if err != nil {`
	`355`	`+ t.Fatal("expected no error, got:", err)`
`356`	`356`	`}`
`357`	`357`	`}`
`358`	`358`	`_, err := p.cli.ReadDir("/foo_01")`