all: A few more interesting linter fixes (#5502)

A couple of minor bugs and simplifications
This commit is contained in:
Jakob Borg
2019-02-02 12:09:07 +01:00
committed by GitHub
parent 0b2cabbc31
commit 9fd270d78e
20 changed files with 55 additions and 68 deletions

View File

@@ -8,8 +8,8 @@ package fs
import (
"bytes"
"io"
"io/ioutil"
"os"
"testing"
)
@@ -23,7 +23,7 @@ func TestFakeFS(t *testing.T) {
if err != nil {
t.Fatal(err)
}
info, err := fs.Stat("dira/dirb")
_, err = fs.Stat("dira/dirb")
if err != nil {
t.Fatal(err)
}
@@ -33,7 +33,7 @@ func TestFakeFS(t *testing.T) {
if err != nil {
t.Fatal(err)
}
info, err = fs.Stat("dira/dirb/dirc")
_, err = fs.Stat("dira/dirb/dirc")
if err != nil {
t.Fatal(err)
}
@@ -51,7 +51,7 @@ func TestFakeFS(t *testing.T) {
}
// Stat on fd
info, err = fd.Stat()
info, err := fd.Stat()
if err != nil {
t.Fatal(err)
}
@@ -75,7 +75,7 @@ func TestFakeFS(t *testing.T) {
}
// Seek
_, err = fd.Seek(1, os.SEEK_SET)
_, err = fd.Seek(1, io.SeekStart)
if err != nil {
t.Fatal(err)
}
@@ -90,7 +90,7 @@ func TestFakeFS(t *testing.T) {
}
// Read again, same data hopefully
_, err = fd.Seek(0, os.SEEK_SET)
_, err = fd.Seek(0, io.SeekStart)
if err != nil {
t.Fatal(err)
}
@@ -133,7 +133,7 @@ func TestFakeFSRead(t *testing.T) {
_ = fd.Truncate(3 * 1 << randomBlockShift)
// Read
_, _ = fd.Seek(0, 0)
_, _ = fd.Seek(0, io.SeekStart)
bs0, err := ioutil.ReadAll(fd)
if err != nil {
t.Fatal(err)
@@ -143,7 +143,7 @@ func TestFakeFSRead(t *testing.T) {
}
// Read again, starting at an odd offset
_, _ = fd.Seek(0, 0)
_, _ = fd.Seek(0, io.SeekStart)
buf0 := make([]byte, 12345)
n, _ := fd.Read(buf0)
if n != len(buf0) {