Skip to content

Commit 455d57f

Browse files
dtfranztmshort
authored andcommitted
Fixing flake tests so they don't fail 100% of the time.
E2E tests were updated recently to use a generated namespace with an OperatorGroup created from the beginning of each test. However some of the tests were not updated to reflect this and were still creating and deleting resources in an additional namespace, or began to fail because the test environment required that no OperatorGroups exist from the beginning of the test. This commit addresses two tests that have been failing at a rate of 100% due to the issues stated above. Signed-off-by: Daniel Franz <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 91b5762a9
1 parent 180d0f4 commit 455d57f

File tree

1 file changed

+3
-26
lines changed

1 file changed

+3
-26
lines changed

staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3077,22 +3077,6 @@ var _ = Describe("Install Plan", func() {
30773077
GinkgoT().Logf("%s: %s", time.Now().Format("15:04:05.9999"), s)
30783078
}
30793079

3080-
ns := &corev1.Namespace{}
3081-
ns.SetName(genName("ns-"))
3082-
3083-
// Create a namespace an OperatorGroup
3084-
ns, err := c.KubernetesInterface().CoreV1().Namespaces().Create(context.Background(), ns, metav1.CreateOptions{})
3085-
require.NoError(GinkgoT(), err)
3086-
deleteOpts := &metav1.DeleteOptions{}
3087-
defer func() {
3088-
require.NoError(GinkgoT(), c.KubernetesInterface().CoreV1().Namespaces().Delete(context.Background(), generatedNamespace.GetName(), *deleteOpts))
3089-
}()
3090-
3091-
og := &operatorsv1.OperatorGroup{}
3092-
og.SetName("og")
3093-
_, err = crc.OperatorsV1().OperatorGroups(generatedNamespace.GetName()).Create(context.Background(), og, metav1.CreateOptions{})
3094-
require.NoError(GinkgoT(), err)
3095-
30963080
mainPackageName := genName("nginx-")
30973081
dependentPackageName := genName("nginxdep-")
30983082

@@ -3211,6 +3195,7 @@ var _ = Describe("Install Plan", func() {
32113195
require.NoError(GinkgoT(), err)
32123196

32133197
// Make sure to clean up the installed CRD
3198+
deleteOpts := &metav1.DeleteOptions{}
32143199
defer func() {
32153200
require.NoError(GinkgoT(), c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Delete(context.Background(), dependentCRD.GetName(), *deleteOpts))
32163201
}()
@@ -3224,17 +3209,11 @@ var _ = Describe("Install Plan", func() {
32243209
When("an InstallPlan is created with no valid OperatorGroup present", func() {
32253210
var (
32263211
installPlanName string
3227-
ns *corev1.Namespace
32283212
)
32293213

32303214
BeforeEach(func() {
3231-
ns = &corev1.Namespace{}
3232-
ns.SetName(genName("ns-"))
3233-
3234-
// Create a namespace
3235-
Eventually(func() error {
3236-
return ctx.Ctx().Client().Create(context.Background(), ns)
3237-
}, timeout, interval).Should(Succeed(), "could not create Namespace")
3215+
// Make sure there are no OGs in the namespace already
3216+
require.NoError(GinkgoT(), crc.OperatorsV1().OperatorGroups(generatedNamespace.GetName()).DeleteCollection(context.Background(), metav1.DeleteOptions{}, metav1.ListOptions{}))
32383217

32393218
// Create InstallPlan
32403219
installPlanName = "ip"
@@ -3253,8 +3232,6 @@ var _ = Describe("Install Plan", func() {
32533232
AfterEach(func() {
32543233
err := crc.OperatorsV1alpha1().InstallPlans(generatedNamespace.GetName()).Delete(context.Background(), installPlanName, metav1.DeleteOptions{})
32553234
Expect(err).NotTo(HaveOccurred())
3256-
err = c.KubernetesInterface().CoreV1().Namespaces().Delete(context.Background(), generatedNamespace.GetName(), metav1.DeleteOptions{})
3257-
Expect(err).ToNot(HaveOccurred())
32583235
})
32593236

32603237
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/2636

0 commit comments

Comments
 (0)