From 3bf32095d203e04bd91d65a40ce9c595fbcac14a Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 6 Oct 2021 00:10:58 -0400 Subject: [PATCH] Type fixes: galaxy_test.api.test_workflows. --- .../api/test_workflow_extraction.py | 1 + lib/galaxy_test/api/test_workflows.py | 29 +++++++++++-------- setup.cfg | 2 -- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/galaxy_test/api/test_workflow_extraction.py b/lib/galaxy_test/api/test_workflow_extraction.py index 773d7bf612d..9c623b34a04 100644 --- a/lib/galaxy_test/api/test_workflow_extraction.py +++ b/lib/galaxy_test/api/test_workflow_extraction.py @@ -8,6 +8,7 @@ from .test_workflows import BaseWorkflowsApiTestCase class WorkflowExtractionApiTestCase(BaseWorkflowsApiTestCase): + history_id: str def setUp(self): super().setUp() diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py index 482fa2b4a98..40dbb8b6923 100644 --- a/lib/galaxy_test/api/test_workflows.py +++ b/lib/galaxy_test/api/test_workflows.py @@ -1,7 +1,9 @@ import json import os +import shutil import time from json import dumps +from tempfile import mkdtemp from typing import Any, cast, Dict, Union from uuid import uuid4 @@ -4402,19 +4404,22 @@ input_c: def test_workflow_from_path_requires_admin(self): # There are two ways to import workflows from paths, just verify both require an admin. - workflow_directory = self._test_driver.mkdtemp() - workflow_path = os.path.join(workflow_directory, "workflow.yml") - with open(workflow_path, "w") as f: - f.write(WORKFLOW_NESTED_REPLACEMENT_PARAMETER) - import_response = self.workflow_populator.import_workflow_from_path_raw(workflow_path) - self._assert_status_code_is(import_response, 403) - self._assert_error_code_is(import_response, error_codes.error_codes_by_name["ADMIN_REQUIRED"]) + workflow_directory = mkdtemp() + try: + workflow_path = os.path.join(workflow_directory, "workflow.yml") + with open(workflow_path, "w") as f: + f.write(WORKFLOW_NESTED_REPLACEMENT_PARAMETER) + import_response = self.workflow_populator.import_workflow_from_path_raw(workflow_path) + self._assert_status_code_is(import_response, 403) + self._assert_error_code_is(import_response, error_codes.error_codes_by_name["ADMIN_REQUIRED"]) - path_as_uri = f"file://{workflow_path}" - import_data = dict(archive_source=path_as_uri) - import_response = self._post("workflows", data=import_data) - self._assert_status_code_is(import_response, 403) - self._assert_error_code_is(import_response, error_codes.error_codes_by_name["ADMIN_REQUIRED"]) + path_as_uri = f"file://{workflow_path}" + import_data = dict(archive_source=path_as_uri) + import_response = self._post("workflows", data=import_data) + self._assert_status_code_is(import_response, 403) + self._assert_error_code_is(import_response, error_codes.error_codes_by_name["ADMIN_REQUIRED"]) + finally: + shutil.rmtree(workflow_directory) def _invoke_paused_workflow(self, history_id): workflow = self.workflow_populator.load_workflow_from_resource("test_workflow_pause") diff --git a/setup.cfg b/setup.cfg index 2f2cba09ab4..98897f91afd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -819,8 +819,6 @@ check_untyped_defs = False check_untyped_defs = False [mypy-galaxy_test.selenium.test_custom_builds] check_untyped_defs = False -[mypy-galaxy_test.api.test_workflows] -check_untyped_defs = False [mypy-galaxy_test.api.test_roles] check_untyped_defs = False [mypy-galaxy_test.api.test_pages]