chore: use assert.NoError instead of assert.Nil for errors
Jorropo committed
May 16, 2023 at 15:33 UTC
da28fbc65a2e0f1ce59f9923823326ae2bc4f713
3 files changed
+10
-10
test/cli/gateway_range_test.go
+4
-4
@@ -31,10 +31,10 @@ func TestGatewayHAMTDirectory(t *testing.T) {
31
32
// Import fixtures
33
r, err := os.Open("./fixtures/TestGatewayHAMTDirectory.car")
34
- assert.Nil(t, err)
34
+ assert.NoError(t, err)
35
defer r.Close()
36
err = node.IPFSDagImport(r, fixtureCid)
37
- assert.Nil(t, err)
37
+ assert.NoError(t, err)
38
39
// Fetch HAMT directory succeeds with minimal refs
40
resp := client.Get(fmt.Sprintf("/ipfs/%s/", hamtCid))
@@ -60,10 +60,10 @@ func TestGatewayMultiRange(t *testing.T) {
60
61
// Import fixtures
62
r, err := os.Open("./fixtures/TestGatewayMultiRange.car")
63
- assert.Nil(t, err)
63
+ assert.NoError(t, err)
64
defer r.Close()
65
err = node.IPFSDagImport(r, fixtureCid)
66
- assert.Nil(t, err)
66
+ assert.NoError(t, err)
67
68
// Succeeds fetching a range of blocks we have
69
resp := client.Get(fmt.Sprintf("/ipfs/%s", fileCid), func(r *http.Request) {
test/cli/gateway_test.go
+2
-2
@@ -28,7 +28,7 @@ func TestGateway(t *testing.T) {
28
cid := node.IPFSAddStr("Hello Worlds!")
29
30
peerID, err := peer.ToCid(node.PeerID()).StringOfBase(multibase.Base36)
31
- assert.Nil(t, err)
31
+ assert.NoError(t, err)
32
33
client := node.GatewayClient()
34
client.TemplateData = map[string]string{
@@ -480,7 +480,7 @@ func TestGateway(t *testing.T) {
480
})
481
482
node2PeerID, err := peer.ToCid(node2.PeerID()).StringOfBase(multibase.Base36)
483
- assert.Nil(t, err)
483
+ assert.NoError(t, err)
484
485
nodes.StartDaemons().Connect()
486
test/cli/swarm_test.go
+4
-4
@@ -35,7 +35,7 @@ func TestSwarm(t *testing.T) {
35
res := node.RunIPFS("swarm", "peers", "--enc=json", "--identify")
36
var output expectedOutputType
37
err := json.Unmarshal(res.Stdout.Bytes(), &output)
38
- assert.Nil(t, err)
38
+ assert.NoError(t, err)
39
assert.Equal(t, 0, len(output.Peers))
40
41
})
@@ -48,7 +48,7 @@ func TestSwarm(t *testing.T) {
48
res := node.RunIPFS("swarm", "peers", "--enc=json", "--identify")
49
var output expectedOutputType
50
err := json.Unmarshal(res.Stdout.Bytes(), &output)
51
- assert.Nil(t, err)
51
+ assert.NoError(t, err)
52
actualID := output.Peers[0].Identify.ID
53
actualPublicKey := output.Peers[0].Identify.PublicKey
54
actualAgentVersion := output.Peers[0].Identify.AgentVersion
@@ -78,12 +78,12 @@ func TestSwarm(t *testing.T) {
78
otherNodeIDResponse := otherNode.RunIPFS("id", "--enc=json")
79
var otherNodeIDOutput identifyType
80
err := json.Unmarshal(otherNodeIDResponse.Stdout.Bytes(), &otherNodeIDOutput)
81
- assert.Nil(t, err)
81
+ assert.NoError(t, err)
82
res := node.RunIPFS("swarm", "peers", "--enc=json", "--identify")
83
84
var output expectedOutputType
85
err = json.Unmarshal(res.Stdout.Bytes(), &output)
86
- assert.Nil(t, err)
86
+ assert.NoError(t, err)
87
outputIdentify := output.Peers[0].Identify
88
89
assert.Equal(t, outputIdentify.ID, otherNodeIDOutput.ID)