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

ci: non-constant format string (govet)

Browse Source 
Signed-off-by: Praveen M <m.praveen@ibm.com>
This commit is contained in:
Praveen M
2024-12-20 18:23:59 +05:30
committed by mergify[bot]
parent 96408c01c8
commit 54a8b50957
14 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
e2e/cephfs.go
View File

@ -218,7 +218,7 @@ var _ = Describe(cephfsType, func() {
err = createSubvolumegroup(f, fileSystemName, subvolumegroup)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to create subvolumegroup %s: %v", subvolumegroup, err)
}
})
@ -261,7 +261,7 @@ var _ = Describe(cephfsType, func() {
err = deleteSubvolumegroup(f, fileSystemName, subvolumegroup)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to delete subvolumegroup %s: %v", subvolumegroup, err)
}
if deployCephFS {
@ -768,7 +768,7 @@ var _ = Describe(cephfsType, func() {
for i := range deplPods {
err = ensureStatSucceeds(deplPods[i].Name)
if err != nil {
framework.Failf(err.Error())
framework.Failf("ensureStatSucceeds failed for pod %q: %v", deplPods[i].Name, err.Error())
}
}
// Kill ceph-fuse in cephfs-csi node plugin Pods.
@ -797,12 +797,12 @@ var _ = Describe(cephfsType, func() {
// the pod with hopefully mounts working again.
err = deletePod(pod2Name, depl.Namespace, c, deployTimeout)
if err != nil {
framework.Failf(err.Error())
framework.Failf("failed to delete pod %s: %v", pod2Name, err.Error())
}
// Wait for the second Pod to be recreated.
err = waitForDeploymentComplete(c, depl.Name, depl.Namespace, deployTimeout)
if err != nil {
framework.Failf(err.Error())
framework.Failf("timeout waiting for deployment %s: %v", depl.Name, err.Error())
}
// List Deployment's pods again to get name of the new pod.
deplPods, err = listPods(f, depl.Namespace, &metav1.ListOptions{
@ -828,7 +828,7 @@ var _ = Describe(cephfsType, func() {
// Verify Pod pod2Name has its ceph-fuse mount working again.
err = ensureStatSucceeds(pod2Name)
if err != nil {
framework.Failf(err.Error())
framework.Failf("ensureStatSucceeds failed for pod %q: %v", pod2Name, err.Error())
}
// Delete created resources.
@ -967,11 +967,11 @@ var _ = Describe(cephfsType, func() {
err = createSubvolumegroup(f, fileSystemName, subvolgrp1)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to create subvolumegroup %s: %v", subvolgrp1, err)
}
err = createSubvolumegroup(f, fileSystemName, subvolgrp2)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to create subvolumegroup %s: %v", subvolgrp2, err)
}
err = createCustomConfigMap(f.ClientSet, cephFSDirPath, clusterInfo)
if err != nil {
@ -1019,11 +1019,11 @@ var _ = Describe(cephfsType, func() {
}
err = deleteSubvolumegroup(f, fileSystemName, subvolgrp1)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to delete subvolumegroup %s: %v", subvolgrp1, err)
}
err = deleteSubvolumegroup(f, fileSystemName, subvolgrp2)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to delete subvolumegroup %s: %v", subvolgrp2, err)
}
err = deleteConfigMap(cephFSDirPath)
if err != nil {
@ -1076,14 +1076,15 @@ var _ = Describe(cephfsType, func() {
}
filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' >" + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' >"+filePath,
cmd,
app.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
// delete PVC and app
@ -2406,14 +2407,15 @@ var _ = Describe(cephfsType, func() {
}
filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
app.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
// delete cloned ROX pvc and app

9
e2e/nfs.go
View File

@ -279,7 +279,7 @@ var _ = Describe("nfs", func() {
err = createSubvolumegroup(f, fileSystemName, subvolumegroup)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to create subvolumegroup %s: %v", subvolumegroup, err)
}
})
@ -320,7 +320,7 @@ var _ = Describe("nfs", func() {
}
err = deleteSubvolumegroup(f, fileSystemName, subvolumegroup)
if err != nil {
framework.Failf("%v", err)
framework.Failf("failed to delete subvolumegroup %s: %v", subvolumegroup, err)
}
if deployNFS {
@ -607,14 +607,15 @@ var _ = Describe("nfs", func() {
}
filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
app.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
// delete PVC and app

19
e2e/rbd.go
View File

@ -1665,7 +1665,7 @@ var _ = Describe("RBD", func() {
}
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
}
@ -1798,7 +1798,7 @@ var _ = Describe("RBD", func() {
}
readOnlyErr := fmt.Sprintf("'%s': Operation not permitted", devPath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
}
err = deletePVCAndDeploymentApp(f, pvcClone, appClone)
@ -3350,14 +3350,15 @@ var _ = Describe("RBD", func() {
}
filePath := appClone.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
appClone.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
}
@ -3464,14 +3465,15 @@ var _ = Describe("RBD", func() {
}
filePath := appClone.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
appClone.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
}
@ -4126,14 +4128,15 @@ var _ = Describe("RBD", func() {
}
filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
cmd := "echo 'Hello World' > " + filePath
_, stdErr := execCommandInPodAndAllowFail(
f,
"echo 'Hello World' > "+filePath,
cmd,
app.Namespace,
&opt)
readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
if !strings.Contains(stdErr, readOnlyErr) {
framework.Failf(stdErr)
framework.Failf("failed to execute command %s: %v", cmd, stdErr)
}
// delete PVC and app

2
e2e/rbd_helper.go
View File

@ -1071,7 +1071,7 @@ func waitToRemoveImagesFromTrash(f *framework.Framework, poolName string, t int)
return true, nil
}
errReason = fmt.Errorf("found %d images found in trash. Image details %v", len(imagesInTrash), imagesInTrash)
framework.Logf(errReason.Error())
framework.Logf("%v", errReason.Error())
return false, nil
})

2
e2e/utils.go
View File

@ -251,7 +251,7 @@ func validateOmapCount(f *framework.Framework, count int, driver, pool, mode str
framework.Logf("additional debug info: rados ls command output: %s, stdErr: %s", stdOut, stdErr)
}
}
framework.Failf("%v", saveErr)
framework.Fail(saveErr.Error())
}
}
}