update tests

Author: geetu040

tests/test_api/test_http.py

@@ -2,7 +2,7 @@
 import time
 import xmltodict
 import pytest
-from openml.testing import TestAPIBase
+from openml.testing import TestBase, TestAPIBase
 import os
 from pathlib import Path
 from urllib.parse import urljoin
@@ -155,27 +155,22 @@ def test_post_and_delete(self):
             <oml:input name="estimation_procedure">17</oml:input>
         </oml:task_inputs>
         """
+        # post
+        response = self.http_client.post(
+            "task",
+            files={"description": task_xml},
+        )
+        self.assertEqual(response.status_code, 200)
+        xml_resp = xmltodict.parse(response.content)
+        task_id = int(xml_resp["oml:upload_task"]["oml:id"])
 
-        task_id = None
-        try:
-            # POST the task
-            post_response = self.http_client.post(
-                "task",
-                files={"description": task_xml},
-            )
-            self.assertEqual(post_response.status_code, 200)
-            xml_resp = xmltodict.parse(post_response.content)
-            task_id = int(xml_resp["oml:upload_task"]["oml:id"])
-
-            # GET the task to verify it exists
-            get_response = self.http_client.get(f"task/{task_id}")
-            self.assertEqual(get_response.status_code, 200)
-
-        finally:
-            # DELETE the task if it was created
-            if task_id is not None:
-                del_response = self.http_client.delete(f"task/{task_id}")
-                self.assertEqual(del_response.status_code, 200)
+        # cleanup incase of failure
+        TestBase._mark_entity_for_removal("task", task_id)
+        TestBase.logger.info(f"collected from {__file__}: {task_id}")
+
+        # delete
+        response = self.http_client.delete(f"task/{task_id}")
+        self.assertEqual(response.status_code, 200)
 
     def test_download_requires_cache(self):
         client = HTTPClient(

tests/test_api/test_versions.py

@@ -1,6 +1,6 @@
 from time import time
 import pytest
-from openml.testing import TestAPIBase
+from openml.testing import TestBase, TestAPIBase
 from openml._api import ResourceV1API, ResourceV2API, FallbackProxy, ResourceAPI
 from openml.enums import ResourceType, APIVersion
 from openml.exceptions import OpenMLNotSupportedError
@@ -18,13 +18,18 @@ def _publish_and_delete(self):
             <oml:input name="estimation_procedure">17</oml:input>
         </oml:task_inputs>
         """
-
+        # publish
         task_id = self.resource.publish(
             "task",
             files={"description": task_xml},
         )
         self.assertIsNotNone(task_id)
 
+        # cleanup incase of failure
+        TestBase._mark_entity_for_removal("task", task_id)
+        TestBase.logger.info(f"collected from {__file__}: {task_id}")
+
+        # delete
         success = self.resource.delete(task_id)
         self.assertTrue(success)