JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/metainfo: don't rely on exact error name

Browse Source 
Change-Id: I7975a00c32891a43b4f1e6dc4f5847201844f2ec
This commit is contained in:
Egon Elbre 2021-04-29 20:56:41 +03:00
parent 65b17df58e
commit 2c657f594e
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
satellite/metainfo/metainfo_test.go
View File

@ -49,7 +49,8 @@ func TestMaxOutBuckets(t *testing.T) {
require.NoError(t, err)
}
err := planet.Uplinks[0].CreateBucket(ctx, planet.Satellites[0], fmt.Sprintf("test%d", limit+1))
require.EqualError(t, err, fmt.Sprintf("uplink: bucket: metainfo error: number of allocated buckets (%d) exceeded", limit))
require.Error(t, err)
require.Contains(t, err.Error(), fmt.Sprintf("number of allocated buckets (%d) exceeded", limit))
})
}
@ -1764,7 +1765,8 @@ func TestMultipartObjectDownloadRejection(t *testing.T) {
Index: -1,
},
})
require.EqualError(t, err, "metainfo error: Used uplink version cannot download multipart objects.")
require.Error(t, err)
require.Contains(t, err.Error(), "Used uplink version cannot download multipart objects.")
objects, err = planet.Satellites[0].Metainfo.Metabase.TestingAllCommittedObjects(ctx, planet.Uplinks[0].Projects[0].ID, "pip-third")
require.NoError(t, err)
@ -1782,7 +1784,8 @@ func TestMultipartObjectDownloadRejection(t *testing.T) {
Index: -1,
},
})
require.EqualError(t, err, "metainfo error: Used uplink version cannot download multipart objects.")
require.Error(t, err)
require.Contains(t, err.Error(), "Used uplink version cannot download multipart objects.")
})
}

2
storagenode/trust/excluder_test.go
View File

@ -25,6 +25,8 @@ func TestNewExcluderFailure(t *testing.T) {
errs: []string{
`exclusion: node URL error: parse ://: missing protocol scheme`,
`exclusion: node URL error: parse "://": missing protocol scheme`,
`exclusion: node URL: parse ://: missing protocol scheme`,
`exclusion: node URL: parse "://": missing protocol scheme`,
},
},
{

7
storagenode/trust/satellite_url_test.go
View File

@ -86,6 +86,8 @@ func TestParseSatelliteURL_Invalid(t *testing.T) {
errs: []string{
`invalid satellite URL: node URL error: parse ://: missing protocol scheme`,
`invalid satellite URL: node URL error: parse "://": missing protocol scheme`,
`invalid satellite URL: node URL: parse ://: missing protocol scheme`,
`invalid satellite URL: node URL: parse "://": missing protocol scheme`,
},
},
{
@ -96,7 +98,10 @@ func TestParseSatelliteURL_Invalid(t *testing.T) {
{
name: "short ID",
url: "121RTSDpy@127.0.0.1:7777",
errs: []string{"invalid satellite URL: node URL error: node ID error: checksum error"},
errs: []string{
"invalid satellite URL: node URL error: node ID error: checksum error",
"invalid satellite URL: node URL: node ID error: checksum error",
},
},
{
name: "missing host:port",