diff --git a/staging/src/k8s.io/mount-utils/mount_helper_test.go b/staging/src/k8s.io/mount-utils/mount_helper_test.go index abbc3199828..3293da66b75 100644 --- a/staging/src/k8s.io/mount-utils/mount_helper_test.go +++ b/staging/src/k8s.io/mount-utils/mount_helper_test.go @@ -41,8 +41,7 @@ func TestDoCleanupMountPoint(t *testing.T) { // and error if the prepare function encountered a fatal error. prepareMnt func(base string) (MountPoint, error, error) // Function that prepares the FakeMounter for the test. - // Returns error if prepareMntr function encountered a fatal error. - prepareMntr func(mntr *FakeMounter) error + prepareMntr func(mntr *FakeMounter) expectErr bool }{ "mount-ok": { @@ -94,9 +93,8 @@ func TestDoCleanupMountPoint(t *testing.T) { } return MountPoint{Device: "/dev/sdb", Path: path}, nil, nil }, - prepareMntr: func(mntr *FakeMounter) error { + prepareMntr: func(mntr *FakeMounter) { mntr.WithSkipMountPointCheck() - return nil }, expectErr: false, }, diff --git a/staging/src/k8s.io/mount-utils/mount_linux_test.go b/staging/src/k8s.io/mount-utils/mount_linux_test.go index 7dae6cb73bd..ba575e0c469 100644 --- a/staging/src/k8s.io/mount-utils/mount_linux_test.go +++ b/staging/src/k8s.io/mount-utils/mount_linux_test.go @@ -30,6 +30,7 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" utilexec "k8s.io/utils/exec" testexec "k8s.io/utils/exec/testing" ) @@ -436,15 +437,17 @@ func TestSearchMountPoints(t *testing.T) { defer os.Remove(tmpFile.Name()) defer tmpFile.Close() for _, v := range testcases { - tmpFile.Truncate(0) - tmpFile.Seek(0, 0) - tmpFile.WriteString(v.mountInfos) - tmpFile.Sync() + assert.NoError(t, tmpFile.Truncate(0)) + _, err := tmpFile.Seek(0, 0) + assert.NoError(t, err) + _, err = tmpFile.WriteString(v.mountInfos) + assert.NoError(t, err) + assert.NoError(t, tmpFile.Sync()) refs, err := SearchMountPoints(v.source, tmpFile.Name()) if !reflect.DeepEqual(refs, v.expectedRefs) { t.Errorf("test %q: expected Refs: %#v, got %#v", v.name, v.expectedRefs, refs) } - if !reflect.DeepEqual(err, v.expectedErr) { + if err != v.expectedErr { t.Errorf("test %q: expected err: %v, got %v", v.name, v.expectedErr, err) } } @@ -703,7 +706,10 @@ func TestFormatConcurrency(t *testing.T) { // for one to be released for i := 0; i < tc.max+1; i++ { go func() { - mounter.format(fstype, nil) + _, err := mounter.format(fstype, nil) + if err != nil { + t.Errorf("format(%q): %v", fstype, err) + } }() } @@ -778,7 +784,10 @@ func TestFormatTimeout(t *testing.T) { for i := 0; i < maxConcurrency+1; i++ { go func() { - mounter.format(fstype, nil) + _, err := mounter.format(fstype, nil) + if err != nil { + t.Errorf("format(%q): %v", fstype, err) + } }() }