From c72f43dc5fb48e358d65caf6c59876ba0f15324e Mon Sep 17 00:00:00 2001 From: Matt Chambers Date: Wed, 16 Aug 2017 10:01:51 -0500 Subject: [PATCH 1/3] Avoid adding `(imported from API)` to workflows This should fail a few tests which I will fix with additional commits. Doing this from GitHub... --- lib/galaxy/managers/workflows.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py index 7c1f41d7b79..0a0b1ffc470 100644 --- a/lib/galaxy/managers/workflows.py +++ b/lib/galaxy/managers/workflows.py @@ -196,7 +196,7 @@ class WorkflowContentsManager(UsesAnnotations): # Put parameters in workflow mode trans.workflow_building_mode = True # If there's a source, put it in the workflow name. - if source: + if source and source != 'API': name = "%s (imported from %s)" % ( data['name'], source ) else: name = data['name'] From 9ef13a1c724a2bb326bba3556019448ef69ae8fd Mon Sep 17 00:00:00 2001 From: Matt Chambers Date: Wed, 16 Aug 2017 10:03:41 -0500 Subject: [PATCH 2/3] Remove `(imported from API)` suffix from test --- test/api/test_search.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/api/test_search.py b/test/api/test_search.py index 55d1549b1b1..350dfefde1f 100644 --- a/test/api/test_search.py +++ b/test/api/test_search.py @@ -9,14 +9,14 @@ class SearchApiTestCase( api.ApiTestCase ): workflow_populator = WorkflowPopulator( self.galaxy_interactor ) workflow_id = workflow_populator.simple_workflow( "test_for_search" ) search_response = self.__search( "select * from workflow" ) - assert self.__has_result_with_name( search_response, "test_for_search (imported from API)" ), search_response.json() + assert self.__has_result_with_name( search_response, "test_for_search" ), search_response.json() # Deleted delete_url = self._api_url( "workflows/%s" % workflow_id, use_key=True ) delete( delete_url ) search_response = self.__search( "select * from workflow where deleted = False" ) - assert not self.__has_result_with_name( search_response, "test_for_search (imported from API)" ), search_response.json() + assert not self.__has_result_with_name( search_response, "test_for_search" ), search_response.json() def __search( self, query ): data = dict( query=query ) From 03a3d34f1e2326c99798299d53fc6b7026aadb09 Mon Sep 17 00:00:00 2001 From: Matt Chambers Date: Wed, 16 Aug 2017 10:05:04 -0500 Subject: [PATCH 3/3] Remove `(imported from API)` suffix from test --- test/api/test_workflows.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/api/test_workflows.py b/test/api/test_workflows.py index 569d2622929..763a7c16afe 100644 --- a/test/api/test_workflows.py +++ b/test/api/test_workflows.py @@ -349,7 +349,7 @@ class WorkflowsApiTestCase( BaseWorkflowsApiTestCase ): upload_response = self._post( route, data=data ) if assert_ok: self._assert_status_code_is( upload_response, 200 ) - self._assert_user_has_workflow_with_name( "%s (imported from API)" % name ) + self._assert_user_has_workflow_with_name( name ) return upload_response def test_update( self ):