3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/24da1a0c57bf/ Changeset: 24da1a0c57bf User: jmchilton Date: 2014-09-16 20:48:39 Summary: Remove newly redundant (and broken) test case. That case was testing rename post job actions without replacements - last week I added a more expansive one with replacements (test_run_with_pja). Affected #: 1 file diff -r 5ba632c506feccdaf7d6c334ad82347f1ea92fb8 -r 24da1a0c57bfe10c42014070ac924dc8c9f09983 test/api/test_workflows.py --- a/test/api/test_workflows.py +++ b/test/api/test_workflows.py @@ -558,21 +558,6 @@ for step in usage_details[ "steps" ]: self._assert_has_keys( step, "workflow_step_id", "order_index", "id" ) - @skip_without_tool( "cat1" ) - def test_post_job_action( self ): - """ Tests both import and execution of post job actions. - """ - workflow = self.workflow_populator.load_workflow( name="test_for_pja_run", add_pja=True ) - workflow_request, history_id = self._setup_workflow_run( workflow ) - run_workflow_response = self._post( "workflows", data=workflow_request ) - self._assert_status_code_is( run_workflow_response, 200 ) - self.dataset_populator.wait_for_history( history_id, assert_ok=True ) - time.sleep(.1) # Give another little bit of time for rename (needed?) - contents = self._get( "histories/%s/contents" % history_id ).json() - # loading workflow with add_pja=True causes workflow output to be - # renamed to 'the_new_name'. - assert "the_new_name" in map( lambda hda: hda[ "name" ], contents ) - def _invocation_details( self, workflow_id, invocation_id ): invocation_details_response = self._get( "workflows/%s/usage/%s" % ( workflow_id, invocation_id ) ) self._assert_status_code_is( invocation_details_response, 200 ) https://bitbucket.org/galaxy/galaxy-central/commits/9059dbe0db58/ Changeset: 9059dbe0db58 User: jmchilton Date: 2014-09-16 20:48:39 Summary: Update workflow API tests for inability to decode ids being a 400 instead of 404. Sort of torn on what this should actually be I guess. Affected #: 1 file diff -r 24da1a0c57bfe10c42014070ac924dc8c9f09983 -r 9059dbe0db5855a0b58669d69177eb5154b9bf9d test/api/test_workflows.py --- a/test/api/test_workflows.py +++ b/test/api/test_workflows.py @@ -26,9 +26,9 @@ self.dataset_populator = DatasetPopulator( self.galaxy_interactor ) self.dataset_collection_populator = DatasetCollectionPopulator( self.galaxy_interactor ) - def test_show_invalid_is_404( self ): - show_response = self._get( "workflow/%s" % self._random_key() ) - self._assert_status_code_is( show_response, 404 ) + def test_show_invalid_key_is_400( self ): + show_response = self._get( "workflows/%s" % self._random_key() ) + self._assert_status_code_is( show_response, 400 ) def test_cannot_show_private_workflow( self ): workflow_id = self.workflow_populator.simple_workflow( "test_not_importportable" ) @@ -134,12 +134,12 @@ run_workflow_response = self._post( "workflows", data=workflow_request ) self._assert_status_code_is( run_workflow_response, 403 ) - def test_404_on_invalid_workflow( self ): + def test_400_on_invalid_workflow_id( self ): workflow = self.workflow_populator.load_workflow( name="test_for_run_does_not_exist" ) workflow_request, history_id = self._setup_workflow_run( workflow ) workflow_request[ "workflow_id" ] = self._random_key() run_workflow_response = self._post( "workflows", data=workflow_request ) - self._assert_status_code_is( run_workflow_response, 404 ) + self._assert_status_code_is( run_workflow_response, 400 ) def test_cannot_run_against_other_users_history( self ): workflow = self.workflow_populator.load_workflow( name="test_for_run_does_not_exist" ) https://bitbucket.org/galaxy/galaxy-central/commits/eb99162379e6/ Changeset: eb99162379e6 User: jmchilton Date: 2014-09-16 20:48:39 Summary: Fix library API test for format field redefinition in 9d152ed. Affected #: 1 file diff -r 9059dbe0db5855a0b58669d69177eb5154b9bf9d -r eb99162379e6c2d73025c5f8dc9c8f1880f31513 test/api/test_libraries.py --- a/test/api/test_libraries.py +++ b/test/api/test_libraries.py @@ -43,7 +43,7 @@ library_dataset = show().json() self._assert_has_keys( library_dataset, "peek", "data_type" ) assert library_dataset[ "peek" ].find("create_test") >= 0 - assert library_dataset[ "data_type" ] == "txt" + assert library_dataset[ "file_ext" ] == "txt", library_dataset[ "file_ext" ] def _create_folder( self, library ): create_data = dict( Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.