Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.

Commit b6ae235

Browse files
committed
cleanup: report test setup failures, fix staticcheck failures
1 parent eaf54e8 commit b6ae235

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

Diff for: ipns_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ import (
66
"time"
77
)
88

9-
var examplesHashForIPNS = "/ipfs/Qmbu7x6gJbsKDcseQv66pSbUcAA3Au6f7MfTYVXwvBxN2K"
10-
var testKey = "self" // feel free to change to whatever key you have locally
9+
var (
10+
//lint:ignore U1000 used only by skipped tests at present
11+
examplesHashForIPNS = "/ipfs/Qmbu7x6gJbsKDcseQv66pSbUcAA3Au6f7MfTYVXwvBxN2K"
12+
//lint:ignore U1000 used only by skipped tests at present
13+
testKey = "self" // feel free to change to whatever key you have locally
14+
)
1115

1216
func TestPublishDetailsWithKey(t *testing.T) {
1317
t.Skip()

Diff for: mfs_test.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,20 @@ func TestMain(m *testing.M) {
1717
for _, f := range files {
1818
file, err := os.Open(fmt.Sprintf("./testdata/%s", f))
1919
if err != nil {
20+
fmt.Fprintf(os.Stderr, "Failed to open test data file: %v\n", err)
2021
os.Exit(1)
2122
}
2223

2324
err = s.FilesWrite(context.Background(), fmt.Sprintf("/testdata/%s", f), file, FilesWrite.Parents(true), FilesWrite.Create(true))
2425
if err != nil {
26+
fmt.Fprintf(os.Stderr, "Failed to write test data, not running tests: %v\n", err)
2527
os.Exit(1)
2628
}
2729
}
2830

2931
exitVal := m.Run()
3032
if err := s.FilesRm(context.Background(), "/testdata", true); err != nil {
33+
fmt.Fprintf(os.Stderr, "Failed to remove test data: %v\n", err)
3134
os.Exit(1)
3235
}
3336
os.Exit(exitVal)
@@ -115,7 +118,7 @@ func TestFilesMv(t *testing.T) {
115118
is.Nil(err)
116119
is.Equal(stat.Hash, "QmfZt7xPekp7npSM6DHDUnFseAiNZQs7wq6muH9o99RsCB")
117120

118-
stat, err = s.FilesStat(context.Background(), "/testdata/readme")
121+
_, err = s.FilesStat(context.Background(), "/testdata/readme")
119122
is.NotNil(err)
120123

121124
err = s.FilesMv(context.Background(), "/testdata/readme2", "/testdata/readme")
@@ -184,6 +187,8 @@ func TestFilesWrite(t *testing.T) {
184187
is.Equal(string(resBytes), "ipfs")
185188

186189
file, err = ioutil.ReadFile("./testdata/ping")
190+
is.Nil(err)
191+
187192
err = s.FilesWrite(context.Background(), "/testdata/ping", bytes.NewBuffer(file), FilesWrite.Offset(0), FilesWrite.Count(2), FilesWrite.Truncate(true))
188193
is.Nil(err)
189194

Diff for: shell.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
files "github.com/ipfs/go-ipfs-files"
2020
homedir "github.com/mitchellh/go-homedir"
2121
ma "github.com/multiformats/go-multiaddr"
22-
manet "github.com/multiformats/go-multiaddr-net"
22+
manet "github.com/multiformats/go-multiaddr/net"
2323
tar "github.com/whyrusleeping/tar-utils"
2424

2525
p2pmetrics "github.com/libp2p/go-libp2p-core/metrics"
@@ -147,7 +147,7 @@ type IdOutput struct {
147147
// return information about the local peer.
148148
func (s *Shell) ID(peer ...string) (*IdOutput, error) {
149149
if len(peer) > 1 {
150-
return nil, fmt.Errorf("Too many peer arguments")
150+
return nil, fmt.Errorf("too many peer arguments")
151151
}
152152

153153
var out IdOutput

0 commit comments

Comments
 (0)