linter: couple fixes

This commit is contained in:
Zach Ramsay
2017-10-03 12:18:21 -04:00
parent 2681f32bdd
commit cf49ba876f
5 changed files with 18 additions and 27 deletions

View File

@ -1,4 +1,3 @@
// nolint: goimports
package autofile
import (
@ -8,19 +7,18 @@ import (
"testing"
"time"
. "github.com/tendermint/tmlibs/common"
cmn "github.com/tendermint/tmlibs/common"
)
func TestSIGHUP(t *testing.T) {
// First, create an AutoFile writing to a tempfile dir
file, name := Tempfile("sighup_test")
err := file.Close()
if err != nil {
file, name := cmn.Tempfile("sighup_test")
if err := file.Close(); err != nil {
t.Fatalf("Error creating tempfile: %v", err)
}
// Here is the actual AutoFile
af, err := OpenAutoFile(name)
af, err := cmn.OpenAutoFile(name)
if err != nil {
t.Fatalf("Error creating autofile: %v", err)
}
@ -36,8 +34,7 @@ func TestSIGHUP(t *testing.T) {
}
// Move the file over
err = os.Rename(name, name+"_old")
if err != nil {
if err := os.Rename(name, name+"_old"); err != nil {
t.Fatalf("Error moving autofile: %v", err)
}
@ -59,17 +56,15 @@ func TestSIGHUP(t *testing.T) {
if err != nil {
t.Fatalf("Error writing to autofile: %v", err)
}
err = af.Close()
if err != nil {
if err := af.Close(); err != nil {
t.Fatalf("Error closing autofile")
}
// Both files should exist
if body := MustReadFile(name + "_old"); string(body) != "Line 1\nLine 2\n" {
if body := cmn.MustReadFile(name + "_old"); string(body) != "Line 1\nLine 2\n" {
t.Errorf("Unexpected body %s", body)
}
if body := MustReadFile(name); string(body) != "Line 3\nLine 4\n" {
if body := cmn.MustReadFile(name); string(body) != "Line 3\nLine 4\n" {
t.Errorf("Unexpected body %s", body)
}
}