mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-17 20:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: correct the cephfs fuse verification podnames

Browse Source 
The podnames were wrongly mention in the e2e tests and this correct
the same.

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2022-04-11 13:50:27 +05:30 committed by mergify[bot]
parent 959df4dbac
commit 9b8bcbd874
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e2e/cephfs.go
View File

@ -456,7 +456,7 @@ var _ = Describe("cephfs", func() {
// clean up after ourselves // clean up after ourselves
err = deletePVCAndValidatePV(f.ClientSet, pvc, deployTimeout) err = deletePVCAndValidatePV(f.ClientSet, pvc, deployTimeout)
if err != nil { if err != nil {
e2elog.Failf("failed to delete PVC: %v", err) e2elog.Failf("failed to delete PVC: %v", err)
} }
validateSubvolumeCount(f, 0, fileSystemName, subvolumegroup) validateSubvolumeCount(f, 0, fileSystemName, subvolumegroup)
err = deleteResource(cephFSExamplePath + "storageclass.yaml") err = deleteResource(cephFSExamplePath + "storageclass.yaml")
@ -575,7 +575,7 @@ var _ = Describe("cephfs", func() {
if err != nil { if err != nil {
e2elog.Failf("killall command failed: err %v, stderr %s", err, stdErr) e2elog.Failf("killall command failed: err %v, stderr %s", err, stdErr)
} }
// Verify Pod podName2 that stat()-ing the mountpoint results in ENOTCONN. // Verify Pod pod2Name that stat()-ing the mountpoint results in ENOTCONN.
stdErr, err = doStat(pod2Name) stdErr, err = doStat(pod2Name)
if err == nil || !strings.Contains(stdErr, "not connected") { if err == nil || !strings.Contains(stdErr, "not connected") {
e2elog.Failf( e2elog.Failf(
@ -583,7 +583,7 @@ var _ = Describe("cephfs", func() {
err, stdErr, err, stdErr,
) )
} }
// Delete podName2 Pod. This serves two purposes: it verifies that deleting pods with // Delete pod2Name Pod. This serves two purposes: it verifies that deleting pods with
// corrupted ceph-fuse mountpoints works, and it lets the replicaset controller recreate // corrupted ceph-fuse mountpoints works, and it lets the replicaset controller recreate
// the pod with hopefully mounts working again. // the pod with hopefully mounts working again.
err = deletePod(pod2Name, depl.Namespace, c, deployTimeout) err = deletePod(pod2Name, depl.Namespace, c, deployTimeout)
@ -616,7 +616,7 @@ var _ = Describe("cephfs", func() {
} }
e2elog.Failf("no new replica found ; found replicas %v", podNames) e2elog.Failf("no new replica found ; found replicas %v", podNames)
} }
// Verify Pod podName3 has its ceph-fuse mount working again. // Verify Pod pod2Name has its ceph-fuse mount working again.
err = ensureStatSucceeds(pod2Name) err = ensureStatSucceeds(pod2Name)
if err != nil { if err != nil {
e2elog.Failf(err.Error()) e2elog.Failf(err.Error())

2
e2e/kms.go
View File

@ -31,7 +31,7 @@ const (
// kmsConfig is an interface that should be used when passing a configuration // kmsConfig is an interface that should be used when passing a configuration
// for a KMS to validation functions. This allows the validation functions to // for a KMS to validation functions. This allows the validation functions to
// work independently from the actual KMS. // work independently of the actual KMS.
type kmsConfig interface { type kmsConfig interface {
canGetPassphrase() bool canGetPassphrase() bool
getPassphrase(f *framework.Framework, key string) (string, string) getPassphrase(f *framework.Framework, key string) (string, string)