2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/5996738d71ac/ Changeset: 5996738d71ac User: jmchilton Date: 2014-03-20 22:12:52 Summary: Drop unit incorrect unit tests added in 410a13e and 01933aa. Workflow run template was causing these methods to be called wrong (and has been for a LONG time), this in turn caused me to misunderstand what the spec for how other_values in tool parameters should operate when writing the tests. The real underlying bug should be fixed with 55cf8bb. Affected #: 1 file diff -r 1285d07792b31e6c1ce9d66f559afc3f49a054a8 -r 5996738d71ace34df5bee3452b8f2cdeda3e230f test/unit/tools/test_select_parameters.py --- a/test/unit/tools/test_select_parameters.py +++ b/test/unit/tools/test_select_parameters.py @@ -35,19 +35,6 @@ # Data ref currently must be same level, if not at top level. assert not self.param.need_late_validation( self.trans, { "reference_source": { "my_name": "42", "input_bam": model.HistoryDatasetAssociation() } } ) - # Following test will fail due to bug in Galaxy. - def test_nested_context_validation_needed_in_repeat( self ): - self.type = "data_column" - self.set_ref_text = True - self.options_xml = '''<options><filter type="data_meta" ref="input_bam" key="dbkey"/></options>''' - assert not self.param.need_late_validation( self.trans, { "series": [ { "my_name": "42", "input_bam": model.HistoryDatasetAssociation() } ] } ) - - def test_nested_context_validation_not_needed_in_repeat( self ): - self.type = "data_column" - self.set_ref_text = True - self.options_xml = '''<options><filter type="data_meta" ref="input_bam" key="dbkey"/></options>''' - assert self.param.need_late_validation( self.trans, { "series": [ { "my_name": "42", "input_bam": basic.RuntimeValue() } ] } ) - def test_filter_param_value( self ): self.options_xml = '''<options from_data_table="test_table"><filter type="param_value" ref="input_bam" column="0" /></options>''' assert ("testname1", "testpath1", False) in self.param.get_options( self.trans, { "input_bam": "testname1" } ) @@ -61,11 +48,6 @@ assert ("testname2", "testpath2", False) in self.param.get_options( self.trans, { "input_bam": "testpath2" } ) assert len( self.param.get_options( self.trans, { "input_bam": "testpath3" } ) ) == 0 - def test_filter_nested( self ): - # Test filtering a parameter inside a conditional (not currently supported.) - self.options_xml = '''<options from_data_table="test_table"><filter type="param_value" ref="input_bam" column="1" /></options>''' - assert ("testname1", "testpath1", False) in self.param.get_options( self.trans, {"condtional1" : { "input_bam": "testpath1", "my_name": 42 } } ) - # TODO: Good deal of overlap here with DataToolParameterTestCase, # refactor. def setUp( self ): https://bitbucket.org/galaxy/galaxy-central/commits/f830918df15b/ Changeset: f830918df15b User: jmchilton Date: 2014-03-20 22:15:20 Summary: Drop functional test for jobs that fails randomly. Affected #: 1 file diff -r 5996738d71ace34df5bee3452b8f2cdeda3e230f -r f830918df15be11380a4628c9c3aad860547e092 test/functional/api/test_jobs.py --- a/test/functional/api/test_jobs.py +++ b/test/functional/api/test_jobs.py @@ -84,28 +84,6 @@ self.__assert_one_search_result( search_payload ) - def test_search_param( self ): - history_id, dataset_id = self.__history_with_ok_dataset() - - inputs = json.dumps( - dict( - input=dict( - src='hda', - id=dataset_id, - ), - num_lines=1, - ) - ) - search_payload = dict( - tool_id="random_lines1", - inputs=inputs, - state="ok", - ) - - self.__run_randomlines_tool( 1, history_id, dataset_id ) - self._wait_for_history( history_id, assert_ok=True ) - self.__assert_one_search_result( search_payload ) - def __assert_one_search_result( self, search_payload ): search_response = self._post( "jobs/search", data=search_payload ) self._assert_status_code_is( search_response, 200 ) 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.