mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-14 02:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: address golangci-lint for csi-common

Browse Source 
addressing golangci-lint issues in the
csi-common related code.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna
2024-04-04 10:55:49 +02:00
committed by mergify[bot]
parent 2465310543
commit a85b4a9305
4 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/csi-common/utils_test.go
View File

@ -25,7 +25,6 @@ import (
"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/csi-addons/spec/lib/go/replication"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
mount "k8s.io/mount-utils"
)
@ -127,12 +126,12 @@ func TestFilesystemNodeGetVolumeStats(t *testing.T) {
}
require.NoError(t, err)
assert.NotEqual(t, len(stats.Usage), 0)
for _, usage := range stats.Usage {
assert.NotEqual(t, usage.Available, -1)
assert.NotEqual(t, usage.Total, -1)
assert.NotEqual(t, usage.Used, -1)
assert.NotEqual(t, usage.Unit, 0)
require.NotEmpty(t, stats.GetUsage())
for _, usage := range stats.GetUsage() {
require.NotEqual(t, -1, usage.GetAvailable())
require.NotEqual(t, -1, usage.GetTotal())
require.NotEqual(t, -1, usage.GetUsed())
require.NotEqual(t, 0, usage.GetUnit())
}
// tests done, no need to retry again
@ -143,9 +142,9 @@ func TestFilesystemNodeGetVolumeStats(t *testing.T) {
func TestRequirePositive(t *testing.T) {
t.Parallel()
assert.Equal(t, requirePositive(0), int64(0))
assert.Equal(t, requirePositive(-1), int64(0))
assert.Equal(t, requirePositive(1), int64(1))
require.Equal(t, int64(0), requirePositive(0))
require.Equal(t, int64(0), requirePositive(-1))
require.Equal(t, int64(1), requirePositive(1))
}
func TestIsBlockMultiNode(t *testing.T) {
@ -204,8 +203,8 @@ func TestIsBlockMultiNode(t *testing.T) {
for _, test := range tests {
isBlock, isMultiNode := IsBlockMultiNode(test.caps)
assert.Equal(t, isBlock, test.isBlock, test.name)
assert.Equal(t, isMultiNode, test.isMultiNode, test.name)
require.Equal(t, isBlock, test.isBlock, test.name)
require.Equal(t, isMultiNode, test.isMultiNode, test.name)
}
}