Skip to content

Commit 4529e44

Browse files
sebrandon1sebrandon1
authored
Add assertions for remaining tests (#1248)
1 parent cb8c614 commit 4529e44

18 files changed

+495
-7
lines changed

‎tests/accesscontrol/tests/access_control_bpf_capability_check.go‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package accesscontrol
33
import (
44
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
6+
corev1 "k8s.io/api/core/v1"
67

78
tshelper "github.com/redhat-best-practices-for-k8s/certsuite-qe/tests/accesscontrol/helper"
89
tsparams "github.com/redhat-best-practices-for-k8s/certsuite-qe/tests/accesscontrol/parameters"
@@ -46,6 +47,11 @@ var _ = Describe("Access-control bpf-capability-check,", func() {
4647
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
4748
Expect(err).ToNot(HaveOccurred())
4849

50+
By("Assert deployment does not have BPF capability")
51+
runningDeployment, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
52+
Expect(err).ToNot(HaveOccurred())
53+
Expect(runningDeployment.Spec.Template.Spec.Containers[0].SecurityContext).To(BeNil())
54+
4955
By("Start test")
5056
err = globalhelper.LaunchTests(
5157
tsparams.TestCaseNameAccessControlBpfCapability,
@@ -70,6 +76,14 @@ var _ = Describe("Access-control bpf-capability-check,", func() {
7076
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
7177
Expect(err).ToNot(HaveOccurred())
7278

79+
By("Assert deployment has BPF capability")
80+
runningDeployment, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
81+
Expect(err).ToNot(HaveOccurred())
82+
Expect(runningDeployment.Spec.Template.Spec.Containers[0].SecurityContext).ToNot(BeNil())
83+
Expect(runningDeployment.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities).ToNot(BeNil())
84+
capabilities := runningDeployment.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities.Add
85+
Expect(capabilities).To(ContainElement(corev1.Capability("BPF")))
86+
7387
By("Start test")
7488
err = globalhelper.LaunchTests(
7589
tsparams.TestCaseNameAccessControlBpfCapability,
@@ -92,6 +106,11 @@ var _ = Describe("Access-control bpf-capability-check,", func() {
92106
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
93107
Expect(err).ToNot(HaveOccurred())
94108

109+
By("Assert deployment1 does not have BPF capability")
110+
runningDeployment, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
111+
Expect(err).ToNot(HaveOccurred())
112+
Expect(runningDeployment.Spec.Template.Spec.Containers[0].SecurityContext).To(BeNil())
113+
95114
By("Define deployment 2 without BPF")
96115
dep2, err := tshelper.DefineDeployment(1, 1, "accesscontroldeployment2", randomNamespace)
97116
Expect(err).ToNot(HaveOccurred())
@@ -100,6 +119,11 @@ var _ = Describe("Access-control bpf-capability-check,", func() {
100119
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep2, tsparams.Timeout)
101120
Expect(err).ToNot(HaveOccurred())
102121

122+
By("Assert deployment2 does not have BPF capability")
123+
runningDeployment2, err := globalhelper.GetRunningDeployment(dep2.Namespace, dep2.Name)
124+
Expect(err).ToNot(HaveOccurred())
125+
Expect(runningDeployment2.Spec.Template.Spec.Containers[0].SecurityContext).To(BeNil())
126+
103127
By("Start test")
104128
err = globalhelper.LaunchTests(
105129
tsparams.TestCaseNameAccessControlBpfCapability,
@@ -124,6 +148,14 @@ var _ = Describe("Access-control bpf-capability-check,", func() {
124148
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
125149
Expect(err).ToNot(HaveOccurred())
126150

151+
By("Assert deployment1 has BPF capability")
152+
runningDeployment, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
153+
Expect(err).ToNot(HaveOccurred())
154+
Expect(runningDeployment.Spec.Template.Spec.Containers[0].SecurityContext).ToNot(BeNil())
155+
Expect(runningDeployment.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities).ToNot(BeNil())
156+
capabilities := runningDeployment.Spec.Template.Spec.Containers[0].SecurityContext.Capabilities.Add
157+
Expect(capabilities).To(ContainElement(corev1.Capability("BPF")))
158+
127159
By("Define deployment 2 without BPF")
128160
dep2, err := tshelper.DefineDeployment(1, 1, "accesscontroldeployment2", randomNamespace)
129161
Expect(err).ToNot(HaveOccurred())
@@ -132,6 +164,11 @@ var _ = Describe("Access-control bpf-capability-check,", func() {
132164
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep2, tsparams.Timeout)
133165
Expect(err).ToNot(HaveOccurred())
134166

167+
By("Assert deployment2 does not have BPF capability")
168+
runningDeployment2, err := globalhelper.GetRunningDeployment(dep2.Namespace, dep2.Name)
169+
Expect(err).ToNot(HaveOccurred())
170+
Expect(runningDeployment2.Spec.Template.Spec.Containers[0].SecurityContext).To(BeNil())
171+
135172
By("Start test")
136173
err = globalhelper.LaunchTests(
137174
tsparams.TestCaseNameAccessControlBpfCapability,

‎tests/accesscontrol/tests/access_control_one_process_per_container.go‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package accesscontrol
33
import (
44
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
6+
corev1 "k8s.io/api/core/v1"
67

78
tshelper "github.com/redhat-best-practices-for-k8s/certsuite-qe/tests/accesscontrol/helper"
89
tsparams "github.com/redhat-best-practices-for-k8s/certsuite-qe/tests/accesscontrol/parameters"
@@ -52,6 +53,13 @@ var _ = Describe("Access-control one-process-per-container,", func() {
5253
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
5354
Expect(err).ToNot(HaveOccurred())
5455

56+
By("Assert pod is running with expected process count")
57+
podList, err := globalhelper.GetListOfPodsInNamespace(randomNamespace)
58+
Expect(err).ToNot(HaveOccurred())
59+
Expect(len(podList.Items)).To(Equal(1))
60+
pod := &podList.Items[0]
61+
Expect(pod.Status.Phase).To(Equal(corev1.PodRunning))
62+
5563
By("Start test")
5664
err = globalhelper.LaunchTests(
5765
tsparams.TestCaseNameAccessControlOneProcessPerContainer,
@@ -76,6 +84,11 @@ var _ = Describe("Access-control one-process-per-container,", func() {
7684
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
7785
Expect(err).ToNot(HaveOccurred())
7886

87+
By("Assert deployment has container with command to launch two processes")
88+
runningDeployment, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
89+
Expect(err).ToNot(HaveOccurred())
90+
Expect(runningDeployment.Spec.Template.Spec.Containers[0].Command).To(Equal(commandToLaunchTwoProcesses))
91+
7992
By("Start test")
8093
err = globalhelper.LaunchTests(
8194
tsparams.TestCaseNameAccessControlOneProcessPerContainer,
@@ -100,6 +113,11 @@ var _ = Describe("Access-control one-process-per-container,", func() {
100113
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
101114
Expect(err).ToNot(HaveOccurred())
102115

116+
By("Assert deployment has two containers")
117+
runningDeployment, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
118+
Expect(err).ToNot(HaveOccurred())
119+
Expect(len(runningDeployment.Spec.Template.Spec.Containers)).To(Equal(2))
120+
103121
By("Start test")
104122
err = globalhelper.LaunchTests(
105123
tsparams.TestCaseNameAccessControlOneProcessPerContainer,
@@ -127,6 +145,12 @@ var _ = Describe("Access-control one-process-per-container,", func() {
127145
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
128146
Expect(err).ToNot(HaveOccurred())
129147

148+
By("Assert deployment has two containers and second container has multi-process command")
149+
runningDeployment, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
150+
Expect(err).ToNot(HaveOccurred())
151+
Expect(len(runningDeployment.Spec.Template.Spec.Containers)).To(Equal(2))
152+
Expect(runningDeployment.Spec.Template.Spec.Containers[1].Command).To(Equal(commandToLaunchTwoProcesses))
153+
130154
By("Start test")
131155
err = globalhelper.LaunchTests(
132156
tsparams.TestCaseNameAccessControlOneProcessPerContainer,

‎tests/accesscontrol/tests/access_control_pod_service_account.go‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ var _ = Describe("Access-control pod-service-account,", func() {
5050
err = globalhelper.CreateAndWaitUntilPodIsReady(testPod, tsparams.Timeout)
5151
Expect(err).ToNot(HaveOccurred())
5252

53+
By("Assert pod has valid service account configured")
54+
runningPod, err := globalhelper.GetRunningPod(randomNamespace, tsparams.TestPodName)
55+
Expect(err).ToNot(HaveOccurred())
56+
Expect(runningPod.Spec.ServiceAccountName).To(Equal(tsparams.TestServiceAccount))
57+
5358
By("Start pod-service-account")
5459
err = globalhelper.LaunchTests(
5560
tsparams.CertsuitePodServiceAccount,
@@ -72,6 +77,11 @@ var _ = Describe("Access-control pod-service-account,", func() {
7277
err := globalhelper.CreateAndWaitUntilPodIsReady(testPod, tsparams.Timeout)
7378
Expect(err).ToNot(HaveOccurred())
7479

80+
By("Assert pod has default service account (Kubernetes assigns 'default' when empty)")
81+
runningPod, err := globalhelper.GetRunningPod(randomNamespace, tsparams.TestPodName)
82+
Expect(err).ToNot(HaveOccurred())
83+
Expect(runningPod.Spec.ServiceAccountName).To(Equal("default"))
84+
7585
By("Start pod-service-account")
7686
err = globalhelper.LaunchTests(
7787
tsparams.CertsuitePodServiceAccount,
@@ -86,14 +96,19 @@ var _ = Describe("Access-control pod-service-account,", func() {
8696
})
8797

8898
It("one pod with default service account [negative]", func() {
89-
By("Define pod with empty service account")
99+
By("Define pod with default service account")
90100
testPod := pod.DefinePod(tsparams.TestPodName, randomNamespace,
91101
tsparams.SampleWorkloadImage, tsparams.TestDeploymentLabels)
92102

93103
pod.RedefineWithServiceAccount(testPod, "default")
94104
err := globalhelper.CreateAndWaitUntilPodIsReady(testPod, tsparams.Timeout)
95105
Expect(err).ToNot(HaveOccurred())
96106

107+
By("Assert pod has default service account")
108+
runningPod, err := globalhelper.GetRunningPod(randomNamespace, tsparams.TestPodName)
109+
Expect(err).ToNot(HaveOccurred())
110+
Expect(runningPod.Spec.ServiceAccountName).To(Equal("default"))
111+
97112
By("Start pod-service-account")
98113
err = globalhelper.LaunchTests(
99114
tsparams.CertsuitePodServiceAccount,

‎tests/accesscontrol/tests/access_control_ssh_daemons.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ var _ = Describe("Access-control ssh-daemons,", func() {
4848
err := globalhelper.CreateAndWaitUntilPodIsReady(testPod, tsparams.Timeout)
4949
Expect(err).ToNot(HaveOccurred())
5050

51+
By("Assert pod is ready")
52+
runningPod, err := globalhelper.GetRunningPod(randomNamespace, tsparams.TestPodName)
53+
Expect(err).ToNot(HaveOccurred())
54+
Expect(runningPod).ToNot(BeNil())
55+
5156
By("Start ssh-daemons")
5257
err = globalhelper.LaunchTests(
5358
tsparams.CertsuiteNoSSHDaemonsAllowed,
@@ -73,6 +78,12 @@ var _ = Describe("Access-control ssh-daemons,", func() {
7378
err = globalhelper.CreateAndWaitUntilPodIsReady(testPod, tsparams.Timeout)
7479
Expect(err).ToNot(HaveOccurred())
7580

81+
By("Assert pod is ready with ssh daemon command configured")
82+
runningPod, err := globalhelper.GetRunningPod(randomNamespace, tsparams.TestPodName)
83+
Expect(err).ToNot(HaveOccurred())
84+
Expect(runningPod).ToNot(BeNil())
85+
Expect(runningPod.Spec.Containers[0].Command).To(Equal(tsparams.SSHDaemonStartContainerCommand))
86+
7687
By("Start ssh-daemons")
7788
err = globalhelper.LaunchTests(
7889
tsparams.CertsuiteNoSSHDaemonsAllowed,

‎tests/affiliatedcertification/tests/affiliated_certification_container_is_certified_digest.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ var _ = Describe("Affiliated-certification container-is-certified-digest,", Seri
6464
err := globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
6565
Expect(err).ToNot(HaveOccurred())
6666

67+
By("Assert deployment is ready")
68+
runningDeployment, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
69+
Expect(err).ToNot(HaveOccurred())
70+
Expect(runningDeployment).ToNot(BeNil())
71+
6772
By("Start test")
6873
err = globalhelper.LaunchTests(
6974
tsparams.TestCaseNameContainerDigest,
@@ -88,6 +93,11 @@ var _ = Describe("Affiliated-certification container-is-certified-digest,", Seri
8893
err := globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
8994
Expect(err).ToNot(HaveOccurred())
9095

96+
By("Assert deployment is ready")
97+
runningDeployment, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
98+
Expect(err).ToNot(HaveOccurred())
99+
Expect(runningDeployment).ToNot(BeNil())
100+
91101
By("Start test")
92102
err = globalhelper.LaunchTests(
93103
tsparams.TestCaseNameContainerDigest,
@@ -141,13 +151,23 @@ var _ = Describe("Affiliated-certification container-is-certified-digest,", Seri
141151
err := globalhelper.CreateAndWaitUntilDeploymentIsReady(dep, tsparams.Timeout)
142152
Expect(err).ToNot(HaveOccurred())
143153

154+
By("Assert deployment1 is ready")
155+
runningDeployment1, err := globalhelper.GetRunningDeployment(dep.Namespace, dep.Name)
156+
Expect(err).ToNot(HaveOccurred())
157+
Expect(runningDeployment1).ToNot(BeNil())
158+
144159
dep2 := deployment.DefineDeployment("affiliated-cert-deployment-2", randomNamespace,
145160
tsparams.CertifiedContainerURLCockroachDB, tsparams.TestDeploymentLabels)
146161

147162
By("Create deployment 2")
148163
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(dep2, tsparams.Timeout)
149164
Expect(err).ToNot(HaveOccurred())
150165

166+
By("Assert deployment2 is ready")
167+
runningDeployment2, err := globalhelper.GetRunningDeployment(dep2.Namespace, dep2.Name)
168+
Expect(err).ToNot(HaveOccurred())
169+
Expect(runningDeployment2).ToNot(BeNil())
170+
151171
By("Start test")
152172
err = globalhelper.LaunchTests(
153173
tsparams.TestCaseNameContainerDigest,

‎tests/affiliatedcertification/tests/affiliated_certification_operator.go‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,19 @@ var _ = Describe("Affiliated-certification operator certification,", Serial, fun
137137
}, tsparams.TimeoutLabelCsv, tsparams.PollingInterval).Should(Not(HaveOccurred()),
138138
ErrorLabelingOperatorStr+tsparams.UncertifiedOperatorPrefixCockroach)
139139

140+
By("Assert operator CSV is ready")
141+
csv, err := tshelper.GetCsvByPrefix(tsparams.UncertifiedOperatorPrefixCockroach, randomNamespace)
142+
Expect(err).ToNot(HaveOccurred())
143+
Expect(csv).ToNot(BeNil())
144+
140145
// Assert that the random report dir exists
141146
Expect(randomReportDir).To(BeADirectory(), "Random report dir does not exist")
142147

143148
// Assert that the random certsuite config dir exists
144149
Expect(randomCertsuiteConfigDir).To(BeADirectory(), "Random certsuite config dir does not exist")
145150

146151
By("Start test")
147-
err := globalhelper.LaunchTests(
152+
err = globalhelper.LaunchTests(
148153
tsparams.TestCaseOperatorAffiliatedCertName,
149154
globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()), randomReportDir, randomCertsuiteConfigDir)
150155
Expect(err).ToNot(HaveOccurred(), "Error running "+
@@ -178,8 +183,16 @@ var _ = Describe("Affiliated-certification operator certification,", Serial, fun
178183
}, tsparams.TimeoutLabelCsv, tsparams.PollingInterval).Should(Not(HaveOccurred()),
179184
ErrorLabelingOperatorStr+tsparams.UncertifiedOperatorPrefixCockroach)
180185

186+
By("Assert both operator CSVs are ready")
187+
certifiedCSV, err := tshelper.GetCsvByPrefix(tsparams.CertifiedOperatorPrefixCockroachCertified, randomNamespace)
188+
Expect(err).ToNot(HaveOccurred())
189+
Expect(certifiedCSV).ToNot(BeNil())
190+
uncertifiedCSV, err := tshelper.GetCsvByPrefix(tsparams.UncertifiedOperatorPrefixCockroach, randomNamespace)
191+
Expect(err).ToNot(HaveOccurred())
192+
Expect(uncertifiedCSV).ToNot(BeNil())
193+
181194
By("Start test")
182-
err := globalhelper.LaunchTests(
195+
err = globalhelper.LaunchTests(
183196
tsparams.TestCaseOperatorAffiliatedCertName,
184197
globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()), randomReportDir, randomCertsuiteConfigDir)
185198
Expect(err).ToNot(HaveOccurred(), "Error running "+
@@ -205,8 +218,13 @@ var _ = Describe("Affiliated-certification operator certification,", Serial, fun
205218
}, tsparams.TimeoutLabelCsv, tsparams.PollingInterval).Should(Not(HaveOccurred()),
206219
ErrorLabelingOperatorStr+grafanaOperatorName)
207220

221+
By("Assert operator CSV is ready")
222+
csv, err := tshelper.GetCsvByPrefix(grafanaOperatorName, randomNamespace)
223+
Expect(err).ToNot(HaveOccurred())
224+
Expect(csv).ToNot(BeNil())
225+
208226
By("Start test")
209-
err := globalhelper.LaunchTests(
227+
err = globalhelper.LaunchTests(
210228
tsparams.TestCaseOperatorAffiliatedCertName,
211229
globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()), randomReportDir, randomCertsuiteConfigDir)
212230
Expect(err).ToNot(HaveOccurred(), "Error running "+
@@ -239,8 +257,16 @@ var _ = Describe("Affiliated-certification operator certification,", Serial, fun
239257
}, tsparams.TimeoutLabelCsv, tsparams.PollingInterval).Should(Not(HaveOccurred()),
240258
ErrorLabelingOperatorStr+tsparams.CertifiedOperatorPrefixCockroachCertified)
241259

260+
By("Assert both operator CSVs are ready")
261+
grafanaCSV, err := tshelper.GetCsvByPrefix(grafanaOperatorName, randomNamespace)
262+
Expect(err).ToNot(HaveOccurred())
263+
Expect(grafanaCSV).ToNot(BeNil())
264+
cockroachCSV, err := tshelper.GetCsvByPrefix(tsparams.CertifiedOperatorPrefixCockroachCertified, randomNamespace)
265+
Expect(err).ToNot(HaveOccurred())
266+
Expect(cockroachCSV).ToNot(BeNil())
267+
242268
By("Start test")
243-
err := globalhelper.LaunchTests(
269+
err = globalhelper.LaunchTests(
244270
tsparams.TestCaseOperatorAffiliatedCertName,
245271
globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()), randomReportDir, randomCertsuiteConfigDir)
246272
Expect(err).ToNot(HaveOccurred(), "Error running "+

‎tests/lifecycle/tests/lifecycle_container_startup.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,12 @@ var _ = Describe("lifecycle-container-poststart", func() {
143143
err := globalhelper.CreateAndWaitUntilPodIsReady(put, tsparams.WaitingTime)
144144
Expect(err).ToNot(HaveOccurred())
145145

146+
By("Assert pod has postStart configured")
147+
runningPod, err := globalhelper.GetRunningPod(randomNamespace, put.Name)
148+
Expect(err).ToNot(HaveOccurred())
149+
Expect(runningPod.Spec.Containers[0].Lifecycle).ToNot(BeNil())
150+
Expect(runningPod.Spec.Containers[0].Lifecycle.PostStart).ToNot(BeNil())
151+
146152
By("Start lifecycle-container-poststart test")
147153
err = globalhelper.LaunchTests(tsparams.CertsuiteContainerStartUpTcName,
148154
globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()), randomReportDir, randomCertsuiteConfigDir)

‎tests/lifecycle/tests/lifecycle_pod_owner_type.go‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ var _ = Describe("lifecycle-pod-owner-type", func() {
4747
err := globalhelper.CreateAndWaitUntilReplicaSetIsReady(replicaSet, tsparams.WaitingTime)
4848
Expect(err).ToNot(HaveOccurred())
4949

50+
By("Assert replicaSet has pods")
51+
podsList, err := globalhelper.GetListOfPodsInNamespace(randomNamespace)
52+
Expect(err).ToNot(HaveOccurred())
53+
Expect(len(podsList.Items)).To(BeNumerically(">=", 3))
54+
5055
By("Start lifecycle-pod-owner-type test")
5156
err = globalhelper.LaunchTests(tsparams.CertsuitePodOwnerTypeTcName,
5257
globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()), randomReportDir, randomCertsuiteConfigDir)
@@ -75,6 +80,11 @@ var _ = Describe("lifecycle-pod-owner-type", func() {
7580
err = globalhelper.CreateAndWaitUntilDeploymentIsReady(deploymentb, tsparams.WaitingTime)
7681
Expect(err).ToNot(HaveOccurred())
7782

83+
By("Assert both deployments have pods")
84+
podsList, err := globalhelper.GetListOfPodsInNamespace(randomNamespace)
85+
Expect(err).ToNot(HaveOccurred())
86+
Expect(len(podsList.Items)).To(BeNumerically(">=", 4))
87+
7888
By("Start lifecycle-pod-owner-type test")
7989
err = globalhelper.LaunchTests(tsparams.CertsuitePodOwnerTypeTcName,
8090
globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()), randomReportDir, randomCertsuiteConfigDir)
@@ -93,6 +103,11 @@ var _ = Describe("lifecycle-pod-owner-type", func() {
93103
err := globalhelper.CreateAndWaitUntilStatefulSetIsReady(statefulSet, tsparams.WaitingTime)
94104
Expect(err).ToNot(HaveOccurred())
95105

106+
By("Assert statefulSet has pod")
107+
runningStatefulSet, err := globalhelper.GetRunningStatefulSet(statefulSet.Namespace, statefulSet.Name)
108+
Expect(err).ToNot(HaveOccurred())
109+
Expect(runningStatefulSet).ToNot(BeNil())
110+
96111
By("Start lifecycle-pod-owner-type test")
97112
err = globalhelper.LaunchTests(tsparams.CertsuitePodOwnerTypeTcName,
98113
globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()), randomReportDir, randomCertsuiteConfigDir)
@@ -112,6 +127,12 @@ var _ = Describe("lifecycle-pod-owner-type", func() {
112127
err := globalhelper.CreateAndWaitUntilPodIsReady(put, tsparams.WaitingTime)
113128
Expect(err).ToNot(HaveOccurred())
114129

130+
By("Assert pod is ready and not owned by any workload")
131+
runningPod, err := globalhelper.GetRunningPod(randomNamespace, put.Name)
132+
Expect(err).ToNot(HaveOccurred())
133+
Expect(runningPod).ToNot(BeNil())
134+
Expect(len(runningPod.OwnerReferences)).To(Equal(0))
135+
115136
By("Start lifecycle-pod-owner-type test")
116137
err = globalhelper.LaunchTests(tsparams.CertsuitePodOwnerTypeTcName,
117138
globalhelper.ConvertSpecNameToFileName(CurrentSpecReport().FullText()), randomReportDir, randomCertsuiteConfigDir)

0 commit comments

Comments
 (0)