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

e2e: Add early return in Context() for disabled tests

Browse Source 
Some parts of the Context() seem to get executed, even when BeforeEach()
did a Skip() for the test. By adding a return inside the Context(), the
tests should not get executed at all.

This was noticed in a failed test, where upgrade was running, eventhough
the job was executed as a nornal non-upgrade one.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2022-04-19 11:25:54 +02:00 committed by mergify[bot]
parent ef1d589caa
commit 701b5d7ecb
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/cephfs.go
View File

@ -277,6 +277,10 @@ var _ = Describe("cephfs", func() {
}) })
Context("Test CephFS CSI", func() { Context("Test CephFS CSI", func() {
if !testCephFS || upgradeTesting {
return
}
It("Test CephFS CSI", func() { It("Test CephFS CSI", func() {
pvcPath := cephFSExamplePath + "pvc.yaml" pvcPath := cephFSExamplePath + "pvc.yaml"
appPath := cephFSExamplePath + "pod.yaml" appPath := cephFSExamplePath + "pod.yaml"

4
e2e/rbd.go
View File

@ -380,6 +380,10 @@ var _ = Describe("RBD", func() {
}) })
Context("Test RBD CSI", func() { Context("Test RBD CSI", func() {
if !testRBD || upgradeTesting {
return
}
It("Test RBD CSI", func() { It("Test RBD CSI", func() {
// test only if ceph-csi is deployed via helm // test only if ceph-csi is deployed via helm
if helmTest { if helmTest {

4
e2e/upgrade-cephfs.go
View File

@ -162,6 +162,10 @@ var _ = Describe("CephFS Upgrade Testing", func() {
}) })
Context("Cephfs Upgrade Test", func() { Context("Cephfs Upgrade Test", func() {
if !upgradeTesting || !testCephFS {
return
}
It("Cephfs Upgrade Test", func() { It("Cephfs Upgrade Test", func() {
By("checking provisioner deployment is running", func() { By("checking provisioner deployment is running", func() {
err = waitForDeploymentComplete(f.ClientSet, cephFSDeploymentName, cephCSINamespace, deployTimeout) err = waitForDeploymentComplete(f.ClientSet, cephFSDeploymentName, cephCSINamespace, deployTimeout)

4
e2e/upgrade-rbd.go
View File

@ -176,6 +176,10 @@ var _ = Describe("RBD Upgrade Testing", func() {
}) })
Context("Test RBD CSI", func() { Context("Test RBD CSI", func() {
if !testRBD || !upgradeTesting {
return
}
It("Test RBD CSI", func() { It("Test RBD CSI", func() {
pvcPath := rbdExamplePath + "pvc.yaml" pvcPath := rbdExamplePath + "pvc.yaml"
appPath := rbdExamplePath + "pod.yaml" appPath := rbdExamplePath + "pod.yaml"