mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-22 06:10:22 +00:00
e2e: Add early return in Context() for disabled tests
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:
parent
ef1d589caa
commit
701b5d7ecb
@ -277,6 +277,10 @@ var _ = Describe("cephfs", func() {
|
||||
})
|
||||
|
||||
Context("Test CephFS CSI", func() {
|
||||
if !testCephFS || upgradeTesting {
|
||||
return
|
||||
}
|
||||
|
||||
It("Test CephFS CSI", func() {
|
||||
pvcPath := cephFSExamplePath + "pvc.yaml"
|
||||
appPath := cephFSExamplePath + "pod.yaml"
|
||||
|
@ -380,6 +380,10 @@ var _ = Describe("RBD", func() {
|
||||
})
|
||||
|
||||
Context("Test RBD CSI", func() {
|
||||
if !testRBD || upgradeTesting {
|
||||
return
|
||||
}
|
||||
|
||||
It("Test RBD CSI", func() {
|
||||
// test only if ceph-csi is deployed via helm
|
||||
if helmTest {
|
||||
|
@ -162,6 +162,10 @@ var _ = Describe("CephFS Upgrade Testing", func() {
|
||||
})
|
||||
|
||||
Context("Cephfs Upgrade Test", func() {
|
||||
if !upgradeTesting || !testCephFS {
|
||||
return
|
||||
}
|
||||
|
||||
It("Cephfs Upgrade Test", func() {
|
||||
By("checking provisioner deployment is running", func() {
|
||||
err = waitForDeploymentComplete(f.ClientSet, cephFSDeploymentName, cephCSINamespace, deployTimeout)
|
||||
|
@ -176,6 +176,10 @@ var _ = Describe("RBD Upgrade Testing", func() {
|
||||
})
|
||||
|
||||
Context("Test RBD CSI", func() {
|
||||
if !testRBD || !upgradeTesting {
|
||||
return
|
||||
}
|
||||
|
||||
It("Test RBD CSI", func() {
|
||||
pvcPath := rbdExamplePath + "pvc.yaml"
|
||||
appPath := rbdExamplePath + "pod.yaml"
|
||||
|
Loading…
Reference in New Issue
Block a user