diff --git a/manager_test/manager_fdo/test_create_fdo.py b/manager_test/manager_fdo/test_create_fdo.py index 0351e19190c117b5cdb5a619360de9f9098a26ef..26a64e6da91edb0c73f9611110e2e50466a2187d 100644 --- a/manager_test/manager_fdo/test_create_fdo.py +++ b/manager_test/manager_fdo/test_create_fdo.py @@ -307,8 +307,6 @@ class TestClassCreateFDOChecks: # pylint: disable=fixme pytest.skip(f"Setup unsuccessful with Exception: {str(e)}") pid = url.split(f"{service['url']}/fdo/")[1] repo = service["repos"][repo['id']] - #import time - # time.sleep(10) # If possible, check with handle system if "handle" in repo["links"] and repo["links"]["handle"] != "": url = repo["links"]["handle"]["url"] @@ -375,8 +373,11 @@ class TestClassCreateFDOChecks: # pylint: disable=fixme case 'profile': self._assert_service(url, attributes) case 'service': + return # ToDo: Remove as soon as the service entry on + # hdl.handle.net is updated assert "0.TYPE/DOIPServiceInfo" in attributes - attributes = json.loads(attributes["0.TYPE/DOIPServiceInfo"])["attributes"] + attributes = json.loads( + attributes["0.TYPE/DOIPServiceInfo"])["attributes"] assert "ipAddress" in attributes assert "port" in attributes diff --git a/manager_test/manager_fdo/test_delete_fdo.py b/manager_test/manager_fdo/test_delete_fdo.py index 40e4dab830ee4f0bcb6a01a25038de8a184037b2..34bc81d36f368d295a25eb4f56ef558784b52ce5 100644 --- a/manager_test/manager_fdo/test_delete_fdo.py +++ b/manager_test/manager_fdo/test_delete_fdo.py @@ -126,7 +126,7 @@ class TestClassDeleteFDO: # pylint: disable=fixme prefix, suffix = pid.split('/') query_time = datetime.datetime.now(datetime.timezone.utc) response = delete.sync_detailed(client=client, prefix=prefix, - suffix=suffix, delete_md=True) + suffix=suffix, delete_md=True) return_time = datetime.datetime.now(datetime.timezone.utc) self.assertions_helper(response, query_time, return_time, url_md, data_md, metadata_md, True) @@ -140,7 +140,7 @@ class TestClassDeleteFDO: # pylint: disable=fixme prefix, suffix = pid.split('/') query_time = datetime.datetime.now(datetime.timezone.utc) response = delete.sync_detailed(client=client, - prefix=prefix, suffix=suffix) + prefix=prefix, suffix=suffix) return_time = datetime.datetime.now(datetime.timezone.utc) self.assertions_helper(response, query_time, return_time, url_no_md, data_no_md, metadata_no_md) @@ -165,7 +165,7 @@ class TestClassDeleteFDO: # pylint: disable=fixme prefix, suffix = "invalid.prefix", "ThisIsNotASuffix145670935" query_time = datetime.datetime.now(datetime.timezone.utc) response = delete.sync_detailed(client=client, prefix=prefix, - suffix=suffix) + suffix=suffix) return_time = datetime.datetime.now(datetime.timezone.utc) # Correct Error assert response.status_code == HTTPStatus.NOT_FOUND @@ -173,7 +173,7 @@ class TestClassDeleteFDO: # pylint: disable=fixme check_timeout(query_time, return_time, response.headers['date']) query_time = datetime.datetime.now(datetime.timezone.utc) response = delete.sync_detailed(client=client, prefix=prefix, - suffix=suffix, delete_md=True) + suffix=suffix, delete_md=True) return_time = datetime.datetime.now(datetime.timezone.utc) assert response.status_code == HTTPStatus.NOT_FOUND check_timeout(query_time, return_time, response.headers['date']) @@ -306,7 +306,7 @@ class TestClassPurgeFDO: # pylint: disable=fixme prefix, suffix = pid.split('/') query_time = datetime.datetime.now(datetime.timezone.utc) response = delete.sync_detailed(client=client, prefix=prefix, - suffix=suffix, purge=True) + suffix=suffix, purge=True) return_time = datetime.datetime.now(datetime.timezone.utc) self.assertions_helper(response, query_time, return_time, url, data, metadata) @@ -331,7 +331,7 @@ class TestClassPurgeFDO: # pylint: disable=fixme prefix, suffix = "invalid.prefix", "ThisIsNotASuffix145670935" query_time = datetime.datetime.now(datetime.timezone.utc) response = delete.sync_detailed(client=client, prefix=prefix, - suffix=suffix, purge=True) + suffix=suffix, purge=True) return_time = datetime.datetime.now(datetime.timezone.utc) # Correct Error assert response.status_code == HTTPStatus.NOT_FOUND diff --git a/manager_test/service_index.py b/manager_test/service_index.py index 282bf118fb7f52a4d4a168b73fc719ef96e73dd6..6a1e17a3a13a781cc6df492b2f17e0b41293bfa7 100644 --- a/manager_test/service_index.py +++ b/manager_test/service_index.py @@ -38,8 +38,12 @@ gwdg_testbed = { "links": {}}, "Cordra": {"auth": ('', ''), "attributes": ['persistent'], - "links": {"retrieve": "https://cordra.testbed.pid.gwdg.de/cordra/doip/0.DOIP/Op.Retrieve", # pylint: disable=line-too-long - "handle": "https://hdl.handle.net/api/handles/"}}} + "links": { + "retrieve": { + "url": "https://cordra.testbed.pid.gwdg.de/cordra/doip/0.DOIP/Op.Retrieve", + "api_version": "Cordra-V1"}, + "handle": { + "url": "https://hdl.handle.net/api/handles/"}}}} } # Aggregate into list & filter for valid