Draft: Tests for non-purge delete

Summary

Added tests for delete, removed some inter-test dependencies, small refactors.

Depends on SDK and Service changes.

Check List for the Author

• All automated tests pass
• Reference related issues
• Appropriate user and developer documentation for new code
• Annotations in code (Gitlab comments)

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Appropriate user and developer documentation for new code
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.

manager_test/manager_fdo/test_delete_fdo.py

@@ -9,7 +9,7 @@ import requests
 
 import fdo_manager_service_api_client.types as client_types
 from fdo_manager_service_api_client import Client
-from fdo_manager_service_api_client.api.fd_os import base_delete
+from fdo_manager_service_api_client.api.fd_os import delete
 from fdo_manager_service_api_client.api.repositories import list_repositories
 
 from ..service_index import services_to_test_changes as services
@@ -125,7 +125,7 @@ class TestClassDeleteFDO:                           # pylint: disable=fixme
                     pid = url_md.split(f'{service_url}/fdo/')[1]
                     prefix, suffix = pid.split('/')
                     query_time = datetime.datetime.now(datetime.timezone.utc)
-                    response = base_delete.sync_detailed(client=client, prefix=prefix,
+                    response = delete.sync_detailed(client=client, prefix=prefix,
                                                          suffix=suffix, delete_md=True)
                     return_time = datetime.datetime.now(datetime.timezone.utc)
                     self.assertions_helper(response, query_time, return_time,
@@ -139,7 +139,7 @@ class TestClassDeleteFDO:                           # pylint: disable=fixme
                     pid = url_no_md.split(f'{service_url}/fdo/')[1]
                     prefix, suffix = pid.split('/')
                     query_time = datetime.datetime.now(datetime.timezone.utc)
-                    response = base_delete.sync_detailed(client=client,
+                    response = delete.sync_detailed(client=client,
                                                          prefix=prefix, suffix=suffix)
                     return_time = datetime.datetime.now(datetime.timezone.utc)
                     self.assertions_helper(response, query_time, return_time,
@@ -164,7 +164,7 @@ class TestClassDeleteFDO:                           # pylint: disable=fixme
         with Client(base_url=service_url) as client:
             prefix, suffix = "invalid.prefix", "ThisIsNotASuffix145670935"
             query_time = datetime.datetime.now(datetime.timezone.utc)
-            response = base_delete.sync_detailed(client=client, prefix=prefix,
+            response = delete.sync_detailed(client=client, prefix=prefix,
                                                  suffix=suffix)
             return_time = datetime.datetime.now(datetime.timezone.utc)
             # Correct Error
@@ -172,7 +172,7 @@ class TestClassDeleteFDO:                           # pylint: disable=fixme
             # Same procedure for delete_md=True
             check_timeout(query_time, return_time, response.headers['date'])
             query_time = datetime.datetime.now(datetime.timezone.utc)
-            response = base_delete.sync_detailed(client=client, prefix=prefix,
+            response = delete.sync_detailed(client=client, prefix=prefix,
                                                  suffix=suffix, delete_md=True)
             return_time = datetime.datetime.now(datetime.timezone.utc)
             assert response.status_code == HTTPStatus.NOT_FOUND
@@ -305,7 +305,7 @@ class TestClassPurgeFDO:                           # pylint: disable=fixme
                     pid = url.split(f'{service_url}/fdo/')[1]
                     prefix, suffix = pid.split('/')
                     query_time = datetime.datetime.now(datetime.timezone.utc)
-                    response = base_delete.sync_detailed(client=client, prefix=prefix,
+                    response = delete.sync_detailed(client=client, prefix=prefix,
                                                          suffix=suffix, purge=True)
                     return_time = datetime.datetime.now(datetime.timezone.utc)
                     self.assertions_helper(response, query_time, return_time,
@@ -330,7 +330,7 @@ class TestClassPurgeFDO:                           # pylint: disable=fixme
         with Client(base_url=service_url) as client:
             prefix, suffix = "invalid.prefix", "ThisIsNotASuffix145670935"
             query_time = datetime.datetime.now(datetime.timezone.utc)
-            response = base_delete.sync_detailed(client=client, prefix=prefix,
+            response = delete.sync_detailed(client=client, prefix=prefix,
                                                  suffix=suffix, purge=True)
             return_time = datetime.datetime.now(datetime.timezone.utc)
             # Correct Error
@@ -424,7 +424,7 @@ class TestClassDeleteFDOChecks:                        # pylint: disable=fixme
                     requests.delete(f"{url_md}?delete_MD=true", timeout=10)
                     with Client(base_url=service['url']) as client:
                         prefix, suffix = url_no_md.split('/')[-2:]
-                        base_delete.sync_detailed(
+                        delete.sync_detailed(
                             prefix, suffix, client=client)
                 except Exception as e:     # pylint: disable=broad-exception-caught
                     pytest.skip(f"Setup unsuccessful with Exception: {str(e)}")