software/end-to-end-testing: ensure cleanup

software/end-to-end-testing/tests/test_lopcomm.py

@@ -6,6 +6,7 @@ from websocket import create_connection
 class WebsocketTestClass(e2e.EndToEndTestCase):
     @classmethod
     def setUpClass(cls):
+        try:
             super().setUpClass()
 
             cls.enb_instance_name = time.strftime('e2e-cb003-enb-%Y-%B-%d-%H:%M:%S')
@@ -32,6 +33,12 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
             cls.waitUntilGreen(cls.enb_instance_name)
             cls.waitUntilGreen(cls.cn_instance_name)
 
+        except Exception as e:
+            cls.logger.error("Error during setup: " + str(e))
+            # Ensure cleanup
+            cls.tearDownClass()
+            raise
+
     @classmethod
     def retry_request(cls, func, *args, **kwargs):
         for attempt in range(cls.max_retries):

software/end-to-end-testing/tests/test_ors.py

@@ -6,6 +6,7 @@ from websocket import create_connection
 class WebsocketTestClass(e2e.EndToEndTestCase):
     @classmethod
     def setUpClass(cls):
+        try:
             super().setUpClass()
 
             cls.enb_instance_name = time.strftime('e2e-ors84-enb-%Y-%B-%d-%H:%M:%S')
@@ -31,6 +32,12 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
             cls.waitUntilGreen(cls.enb_instance_name)
             cls.waitUntilGreen(cls.cn_instance_name)
 
+        except Exception as e:
+            cls.logger.error("Error during setup: " + str(e))
+            # Ensure cleanup
+            cls.tearDownClass()
+            raise
+
     @classmethod
     def retry_request(cls, func, *args, **kwargs):
         for attempt in range(cls.max_retries):