Commit Graph
1230 Commits
Author SHA1 Message Date
mvdbeek 973f6679d6 Merge branch 'release_21.09' into release_22.01 2022-02-11 13:29:04 +01:00
mvdbeek 96e76c62d2 Don't record version command as part of command line
Fixes https://github.com/galaxyproject/galaxy/issues/13306
2022-02-08 15:52:06 +01:00
mvdbeek bec9d4b49f Fix resuming job when job has optional data parameters
This fixes
```
ERROR    galaxy.tools.actions:__init__.py:683 Cannot remap rerun dependencies.
Traceback (most recent call last):
  File "/Users/mvandenb/src/galaxy/lib/galaxy/tools/actions/__init__.py", line 664, in _remap_job_on_rerun
    self.__remap_parameters(job_to_remap, jtid, jtod, out_data)
  File "/Users/mvandenb/src/galaxy/lib/galaxy/tools/actions/__init__.py", line 694, in __remap_parameters
    input_values = {p.name: json.loads(p.value) for p in job_to_remap.parameters}
  File "/Users/mvandenb/src/galaxy/lib/galaxy/tools/actions/__init__.py", line 694, in <dictcomp>
    input_values = {p.name: json.loads(p.value) for p in job_to_remap.parameters}
  File "/usr/local/Cellar/python@3.9/3.9.10/Frameworks/Python.framework/Versions/3.9/lib/python3.9/json/__init__.py", line 339, in loads
    raise TypeError(f'the JSON object must be str, bytes or bytearray, '
TypeError: the JSON object must be str, bytes or bytearray, not
NoneType
```

Optional data inputs or optional selects are stored as `None` (super
inconsistent, since most other parameters are stored as JOSN. We should
create "basic_2.py" using pydantic at one point not too far into the
future ...). This means we can't call `json.loads` on these. Fortunately
this is the only place we do it, and we don't need to consider optional
parameters here anyway.
2022-02-08 15:45:01 +01:00
John Chilton 671ca0a7fe Implement bioconductor xref on the frontend.
Cleanup xref rendering a bit.
2022-02-02 14:56:07 -05:00
John Chilton 9f8223d845 Merge pull request #10304 from bernt-matthias/topic/test-sort-order-multiple
Reimplement collection order test, add wrong order, add `expect_test_failure` attribute
2022-01-20 12:31:01 -05:00
Matthias Bernt 2e33be78ac make param_value filter work with multi data inputs
ie data with multiple=true and collections
2022-01-11 15:54:42 +01:00
Matthias Bernt b53f29465f comment forward reference
seems that it is not possible to refer other input parameters
that are defined below in the xml
2022-01-11 15:54:42 +01:00
Matthias Bernt 07d66b8ae0 do not add hg38 to test data table
interferes with another test
2022-01-11 15:54:42 +01:00
Matthias Bernt c8090031b7 add test for param_value filter 2022-01-11 15:54:42 +01:00
Marius van den BeekandNicola Soranzo c19ef49957 Use different syntax
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2022-01-10 18:26:04 +01:00
mvdbeek 9ec830aad0 Don't template version command 2022-01-10 15:53:22 +01:00
Sergey Golitsynskiy 7cc3a418ce Fix selenium test (bibtex rendering) 2022-01-03 16:18:20 -05:00
Matthias Bernt 34cd037df3 restructure tests
- put them all in one test tool
- and add other select parameter types
2021-12-16 09:55:12 +01:00
Matthias Bernt defbfbe8cf test for optional & multiple column select
showing that its currently not possible to select no column

and the same for a select with dynamic options (wo legal_values)
that shows that it works here
2021-12-16 09:55:12 +01:00
John Chilton 918302c23e Fix running pytest test/integration/test_remote_files.py::RemoteFilesIntegrationTestCase directly. 2021-12-08 11:33:13 -05:00
Nicola Soranzo 55b690ac99 Remove missing tool from functional test tool conf 2021-12-08 08:14:14 +00:00
Nicola Soranzo 9f89cd4d56 Fix errors in loading functional test tools 2021-12-08 08:14:13 +00:00
Nicola Soranzo 6c0036fb57 Fix wrong test tool file path 2021-12-08 08:14:13 +00:00
Nicola Soranzo cf1d036b1c Remove entry already in lib/galaxy/config/sample/tool_conf.xml.sample
Cannot be imported from this directory any way.
2021-12-08 08:14:12 +00:00
Nicola Soranzo 30337fbd94 Merge branch 'release_21.09' into dev 2021-11-23 13:30:36 +00:00
Matthias Bernt b0bdcd9fc1 implement expect_test_failure attribute for tests 2021-11-22 12:26:03 +01:00
Matthias Bernt dd4736bbd6 add expect_failure to test that should fail 2021-11-22 12:26:03 +01:00
Matthias Bernt 109dd3a9b5 add a 2nd test checking the sort order of collection elements
all collection have a wrong order and the test should fail
2021-11-22 12:26:03 +01:00
Matthias Bernt 074b011b41 fix value_in_data_table validator for multiple selects 2021-11-17 15:55:01 +01:00
mvdbeek 58b2837c7c Merge branch 'release_21.09' into dev 2021-11-01 18:17:54 +01:00
mvdbeek c27c86d275 Disable created_from_basename test, doesn't work with default setup 2021-10-31 14:19:38 +01:00
mvdbeek 1a531cd1a0 Fix from work dir glob with extended metadata
I also have a commit coming for pulsar that fixes this if pulsar stages
out from_work_dir outputs.
2021-10-31 13:06:41 +01:00
mvdbeek 9165677df6 Merge branch 'release_21.09' into dev 2021-10-28 11:40:04 +02:00
mvdbeek 0f2e601d69 Add tsv to test datatype config 2021-10-26 17:59:07 +02:00
Nicola Soranzo 90a729e431 New pyupgrade fixes
Found by running `ack --type=python -f | grep -v '^tools/' | xargs pyupgrade --py36-plus`
2021-10-24 12:10:34 +01:00
mvdbeek 5b7cb2257d Add testcase 2021-10-02 20:27:03 +02:00
mvdbeek 97c5bd8771 Merge API GalaxyInteractorTestCase into integration test
This seems more appropraite as an integration test.
2021-09-23 19:05:30 +02:00
mvdbeek 66fd430763 Include tool_version in API requests for test-data
Should fix https://github.com/galaxyproject/ephemeris/issues/179.
2021-09-23 19:05:30 +02:00
mvdbeek ed9f46f757 Add two versions of build_list tool 2021-09-20 14:17:14 +02:00
Marius van den Beek f10aecbf4c Merge pull request #11043 from bernt-matthias/topic/validator-negate
Add `negate` attribute to validators .. and tests for all
2021-09-16 11:54:24 +02:00
mvdbeek e60a9af01b Fix is_of_type for datasets in a collection
Include a test tool that fails like this without the fix:

```
Traceback (most recent call last):
  File "/Users/mvandenb/src/galaxy/lib/galaxy/util/template.py", line 80, in fill_template
    return unicodify(t, log_exception=False)
  File "/Users/mvandenb/src/galaxy/lib/galaxy/util/__init__.py", line 1060, in unicodify
    value = str(value)
  File "/Users/mvandenb/src/galaxy/.venv/lib/python3.9/site-packages/Cheetah/Template.py", line 1053, in __unicode__
    return getattr(self, mainMethName)()
  File "cheetah_DynamicallyCompiledCheetahTemplate_1631180564_759418_48584.py", line 89, in respond
  File "/Users/mvandenb/src/galaxy/lib/galaxy/tools/wrappers.py", line 342, in is_of_type
    datatype = self.datatypes_registry.get_datatype_by_extension(e)
AttributeError: 'NoneType' object has no attribute 'get_datatype_by_extension'

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/Users/mvandenb/src/galaxy/lib/galaxy/jobs/runners/__init__.py", line 237, in prepare_job
    job_wrapper.prepare()
  File "/Users/mvandenb/src/galaxy/lib/galaxy/jobs/__init__.py", line 1160, in prepare
    self.command_line, self.extra_filenames, self.environment_variables = tool_evaluator.build()
  File "/Users/mvandenb/src/galaxy/lib/galaxy/tools/evaluation.py", line 463, in build
    raise e
  File "/Users/mvandenb/src/galaxy/lib/galaxy/tools/evaluation.py", line 459, in build
    self.__build_command_line()
  File "/Users/mvandenb/src/galaxy/lib/galaxy/tools/evaluation.py", line 484, in __build_command_line
    command_line = fill_template(command, context=param_dict, python_template_version=self.tool.python_template_version)
  File "/Users/mvandenb/src/galaxy/lib/galaxy/util/template.py", line 118, in fill_template
    return fill_template(template_text=template_text,
  File "/Users/mvandenb/src/galaxy/lib/galaxy/util/template.py", line 126, in fill_template
    raise first_exception or e
  File "/Users/mvandenb/src/galaxy/lib/galaxy/util/template.py", line 80, in fill_template
    return unicodify(t, log_exception=False)
  File "/Users/mvandenb/src/galaxy/lib/galaxy/util/__init__.py", line 1060, in unicodify
    value = str(value)
  File "/Users/mvandenb/src/galaxy/.venv/lib/python3.9/site-packages/Cheetah/Template.py", line 1053, in __unicode__
    return getattr(self, mainMethName)()
  File "cheetah_DynamicallyCompiledCheetahTemplate_1631180564_725492_78593.py", line 87, in respond
  File "/Users/mvandenb/src/galaxy/lib/galaxy/tools/wrappers.py", line 342, in is_of_type
    datatype = self.datatypes_registry.get_datatype_by_extension(e)
AttributeError: 'NoneType' object has no attribute 'get_datatype_by_extension'
```

Broken in https://github.com/galaxyproject/galaxy/pull/11613
2021-09-09 11:45:53 +02:00
Dannon b3cf836e1c Merge pull request #12327 from jmchilton/tool_panel_views_0
Implement tool panel views.
2021-08-18 18:54:39 -07:00
John Chilton 853d7e978d API test case to ensure dataset names get escaped during tool evaluation.
I think other sanitization properties aren't testing that model properties are escaped.
2021-08-18 13:41:06 -04:00
Nate Coraor a6ac841f85 Support setting per-job-environment container resolvers using the container_resolvers key in the environment config. 2021-08-17 10:28:51 -04:00
John Chilton e4d7cb5208 EDAM info on test tools. 2021-08-11 10:14:43 -04:00
Matthias Bernt a60a231b28 remove TODOs from functional tool tests
I guess test data is referred by the file name. This leads to a clash
with the dbkeys.
2021-08-02 15:02:11 +02:00
Matthias Bernt a0046e4316 improved default messages from validators
- improved default messages
- allways substitute %s by value, deprecate `substitute_by_value`
- add functional tool tests to the tool_conf file (forgotten before)
  and small fixes
2021-08-02 15:02:10 +02:00
Matthias Bernt 7a1dd0ae4a MetadataInFileColumnValidator, MetadataInDataTableColumnValidator test, negate
- add tests
- implement negate attribute
2021-08-02 15:02:10 +02:00
Matthias Bernt a4be8acd51 ValueInDataTableColumnValidator fix, test and negate
- add possibility to negate
- add test tool (doc test seems to complicated)
- fix access to fields: was
`self.valid_values.append(fields[self._column]` needed to be `self.valid_values.append(fields[self._metadata_column])`
2021-08-02 15:02:10 +02:00
mvdbeek 73f3c442fe Separate test cases 2021-07-13 17:30:56 +02:00
mvdbeek ac29c883a0 Use relative path in recursive discover_datasets tag
I've added a new option for this. While this might be the intuitive
default I don't want to break existing tools, so the new option is
`match_relative_path`.
2021-07-13 11:48:34 +02:00
Nicola Soranzo 8b55e59ee7 Merge pull request #12185 from bernt-matthias/topic/test/converters 2021-06-25 00:30:51 +01:00
M BerntandNicola Soranzo b92a55e7f4 Apply suggestions from code review
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2021-06-24 20:39:16 +02:00
Matthias Bernt e8a7876969 rename __target_datatpe to __target_datatype__
for consistency

and add documentation
2021-06-24 11:41:34 +02:00
M BerntandNicola Soranzo ad20604a75 Apply suggestions from code review
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2021-06-24 09:34:25 +02:00