From f87c3844be7d7f8ff5300d4dfacbbd88dc4331fe Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Tue, 5 Dec 2023 12:11:53 +0100 Subject: [PATCH] Delete element from TestOutput --- .../tool_util/schemas/generated/galaxy.py | 1 - .../tool_util/schemas/postprocess_schema.py | 1 + .../tool_util/schemas/test_file_schema.json | 21 ------------------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/lib/galaxy/tool_util/schemas/generated/galaxy.py b/lib/galaxy/tool_util/schemas/generated/galaxy.py index dc612eeab8f9..e3a20ed18c0a 100644 --- a/lib/galaxy/tool_util/schemas/generated/galaxy.py +++ b/lib/galaxy/tool_util/schemas/generated/galaxy.py @@ -4998,7 +4998,6 @@ class TestOutput(BaseSetting): content assertion should be preferred, because this avoids storing the test file. """ - element: List["TestOutput"] = field(default_factory=list, metadata={"type": "Element"}) discovered_dataset: List["TestDiscoveredDataset"] = field(default_factory=list, metadata={"type": "Element"}) assert_contents: Union[List[TestAssertions], TestAssertions] = field( default_factory=list, diff --git a/lib/galaxy/tool_util/schemas/postprocess_schema.py b/lib/galaxy/tool_util/schemas/postprocess_schema.py index 68bec42d2c2c..2019bddba996 100644 --- a/lib/galaxy/tool_util/schemas/postprocess_schema.py +++ b/lib/galaxy/tool_util/schemas/postprocess_schema.py @@ -33,6 +33,7 @@ ] ATTRIBUTES_TO_DELETE = [ "TestOutputCollection.name", + "TestOutput.element", ] MODIFICATION_BY_MODULE: dict[str, dict[str, str]] = defaultdict(dict) diff --git a/lib/galaxy/tool_util/schemas/test_file_schema.json b/lib/galaxy/tool_util/schemas/test_file_schema.json index 154bfe356a43..cc13d86dffbe 100644 --- a/lib/galaxy/tool_util/schemas/test_file_schema.json +++ b/lib/galaxy/tool_util/schemas/test_file_schema.json @@ -1802,13 +1802,6 @@ "TestDiscoveredDataset": { "additionalProperties": false, "properties": { - "element_tests": { - "items": { - "$ref": "#/$defs/TestOutput" - }, - "title": "Element Tests", - "type": "array" - }, "discovered_dataset": { "items": { "$ref": "#/$defs/TestDiscoveredDataset" @@ -2057,13 +2050,6 @@ "TestExtraFile": { "additionalProperties": false, "properties": { - "element_tests": { - "items": { - "$ref": "#/$defs/TestOutput" - }, - "title": "Element Tests", - "type": "array" - }, "discovered_dataset": { "items": { "$ref": "#/$defs/TestDiscoveredDataset" @@ -2312,13 +2298,6 @@ "TestOutput": { "additionalProperties": false, "properties": { - "element_tests": { - "items": { - "$ref": "#/$defs/TestOutput" - }, - "title": "Element Tests", - "type": "array" - }, "discovered_dataset": { "items": { "$ref": "#/$defs/TestDiscoveredDataset"