Move oom tests to own suite

Signed-off-by: Christian Zunker <[email protected]>
mondoohq · Nov 21, 2023 · b950a29 · b950a29
1 parent 8aa8326
commit b950a29
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 15 deletions.
diff --git a/tests/integration/audit_config_oom_test.go b/tests/integration/audit_config_oom_test.go
@@ -0,0 +1,48 @@
+// Copyright (c) Mondoo, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+package integration
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/suite"
+	"go.mondoo.com/mondoo-operator/tests/framework/utils"
+	"go.uber.org/zap"
+)
+
+type AuditConfigOOMSuite struct {
+	AuditConfigBaseSuite
+}
+
+func (s *AuditConfigOOMSuite) TestOOMControllerReporting() {
+	auditConfig := utils.DefaultAuditConfigMinimal(s.testCluster.Settings.Namespace, false, false, false, false)
+	s.testOOMMondooOperatorController(auditConfig)
+}
+
+func (s *AuditConfigOOMSuite) TestOOMScanAPI() {
+	auditConfig := utils.DefaultAuditConfigMinimal(s.testCluster.Settings.Namespace, true, false, false, false)
+	s.testOOMScanAPI(auditConfig)
+}
+
+func (s *AuditConfigOOMSuite) TestOOMNodeScan() {
+	auditConfig := utils.DefaultAuditConfigMinimal(s.testCluster.Settings.Namespace, false, false, true, false)
+	s.testOOMNodeScan(auditConfig)
+}
+
+func TestAuditConfigOOMSuite(t *testing.T) {
+	s := new(AuditConfigOOMSuite)
+	defer func(s *AuditConfigOOMSuite) {
+		HandlePanics(recover(), func() {
+			if err := s.testCluster.UninstallOperator(); err != nil {
+				zap.S().Errorf("Failed to uninstall Mondoo operator. %v", err)
+			}
+			if s.spaceClient != nil {
+				if err := s.spaceClient.Delete(s.ctx); err != nil {
+					zap.S().Errorf("Failed to delete Mondoo space. %v", err)
+				}
+			}
+		}, s.T)
+	}(s)
+	suite.Run(t, s)
+}
diff --git a/tests/integration/audit_config_test.go b/tests/integration/audit_config_test.go
@@ -17,11 +17,6 @@ type AuditConfigSuite struct {
 	AuditConfigBaseSuite
 }
 
-func (s *AuditConfigSuite) TestOOMControllerReporting() {
-	auditConfig := utils.DefaultAuditConfigMinimal(s.testCluster.Settings.Namespace, false, false, false, false)
-	s.testOOMMondooOperatorController(auditConfig)
-}
-
 func (s *AuditConfigSuite) TestReconcile_AllDisabled() {
 	auditConfig := utils.DefaultAuditConfigMinimal(s.testCluster.Settings.Namespace, false, false, false, false)
 	s.testMondooAuditConfigAllDisabled(auditConfig)
@@ -32,16 +27,6 @@ func (s *AuditConfigSuite) TestReconcile_KubernetesResources() {
 	s.testMondooAuditConfigKubernetesResources(auditConfig)
 }
 
-func (s *AuditConfigSuite) TestOOMScanAPI() {
-	auditConfig := utils.DefaultAuditConfigMinimal(s.testCluster.Settings.Namespace, true, false, false, false)
-	s.testOOMScanAPI(auditConfig)
-}
-
-func (s *AuditConfigSuite) TestOOMNodeScan() {
-	auditConfig := utils.DefaultAuditConfigMinimal(s.testCluster.Settings.Namespace, false, false, true, false)
-	s.testOOMNodeScan(auditConfig)
-}
-
 func (s *AuditConfigSuite) TestReconcile_Containers() {
 	auditConfig := utils.DefaultAuditConfigMinimal(s.testCluster.Settings.Namespace, false, true, false, false)