Commit Graph
757 Commits
Author SHA1 Message Date
Martin Cech 9b4cd096e1 Merge pull request #4505 from jmchilton/composite_upload_refine
Tests and clarifications for composite uploads.
2017-09-04 21:02:40 -04:00
John Chilton aba726a89f Move twilltestcase from `base to functional` module.
This way nothing in ``base`` has any dependencies on Twill anymore.
2017-09-01 12:30:18 -04:00
John Chilton 7343463dac Rework hack to inject database contexts into Tool Shed tests.
Rather than depend on something in ``functional`` test module from ``base.driver_util``, just set these global hacks up in ``driver_util`` itself. This eliminates a dependency of ``functional`` on ``base`` - ideally ``base`` would not depend on any other test modules.
2017-09-01 12:30:18 -04:00
John Chilton 6e17ff57ea Remove test/functional/test_library_templates.py.
Hasn't been run in forever and it seems like we are deprecating these features.
2017-09-01 12:30:07 -04:00
John Chilton 259e12d760 Continue separation of FunctionalTestCase from TwillTestCase.
Move non-twill stuff out into its own module including FunctionalTestCase.
2017-09-01 12:30:07 -04:00
John Chilton 5a7a15d161 Test and clarifications for composite uploads.
- Add an API test for datatype-defined composite uploads - including exercising newline conversion and the space_to_tab parameter.
- Add a test decorator skip_without_datatype to mirror skip_without_tool for this test, improve both decorators.
- The ftype parameter in the composite test tools does nothing - drop it and drop it from the XSD spec.
- Slightly improve the documentation for these composite_data elements in the XSD.
2017-08-31 12:47:40 -04:00
Nicola Soranzo 8dc0e697d3 Fix vcf_bgzip datatype
In https://github.com/galaxyproject/galaxy/pull/4254 `vcf_bgzip` was made
a proper datatype with the introduction of the `VcfGz` class, but was
still described as a subclass in `datatypes_conf.xml` .

Also fix `file_ext` attribute in `BaseVcf` and subclasses.
2017-08-22 17:53:40 +01:00
John Chilton a8bec7a275 Allow override of provided metadata location.
Eliminates that terrible circular dependency between tools and jobs.
2017-08-17 15:41:11 -04:00
John Chilton 39d4411f8c Move determining tool provided metadata style to tool parser.
Allow override by specifying "provided_metadata_style=" attribute on outputs in tool XML - this should allow newer profile tools to use the older style JSON providing a clear path for upgrades.
2017-08-17 15:41:11 -04:00
John Chilton 6563e387a5 Allow discovering dataset collections in galaxy.json in a nested fashion.
Fixes #2658.
2017-08-17 15:41:11 -04:00
John Chilton 72e361bcf1 Allow discovering datasets directly from galaxy.json...
without needing to specify a discovered dataset pattern. If the ``discovered_datasets`` tag includes ``from_tool_provided_metadata="true"`` the datsets listed in galaxy.json will just be used directly without needing to be "discovered" using a dataset pattern. Metadata and such can continue to be specified either in that file or on the discovered_dataset element except things like pattern (which is not used) and sort_by (since the json should describe the order I suppose).
2017-08-17 15:41:10 -04:00
John Chilton 517f248ac4 Overhaul of tool provided job metadata.
- Add another test to demonstrate referencing entries in galaxy.json for datasets by dataset path basename instead of ID.
- Add a bit more documentation to test tools.
- Redo the structure of galaxy.json for profile >= 17.09 tools with two new test tools to demonstrate the new structure - for both output dataset metadata and discovered dataset metadata.
- Improved abstractions for interaction between tools and jobs to enable different tool provided metadata collection depending on tool profile version.
2017-08-17 15:41:10 -04:00
Nicola Soranzo a353b2e88f Fix E127 errors introduced by previous commit
using:
```
autopep8 -i -r --exclude $(sed -e 's|^|./|' -e 's|/$||' .ci/flake8_blacklist.txt | paste -sd,) --select E127 .
```
2017-08-17 11:35:39 +01:00
Nicola Soranzo 21b44bf348 Fix all E201 and E202 style errors
using the following command:
```
autopep8 -i -r --exclude $(sed -e 's|^|./|' -e 's|/$||' .ci/flake8_blacklist.txt | paste -sd,) --select E201,E202 .
```
2017-08-17 11:35:39 +01:00
John Chilton 06ca789f92 Configuration tests for the last few upload enhancements. 2017-08-12 07:13:05 -04:00
John Chilton bcdf2c84f6 Merge pull request #4254 from ffinfo/vcf_gz_datatype
Vcf gz datatype
2017-08-10 12:14:05 -04:00
John Chilton e3de5e250d Merge pull request #4329 from glormph/collection_list_sort
Created alphabetic and numerical sort tool for collection operations
2017-08-10 12:11:10 -04:00
mvdbeek b4c72eaccf Fix the command section (thx @nsoranzo) 2017-08-07 16:42:23 +02:00
mvdbeek 2e31a5b6d1 Add test tool for API tests 2017-08-07 16:12:20 +02:00
mvdbeek 35c0a47703 Add test API test for default_identifier_source 2017-08-02 18:24:03 +02:00
Jorrit Boekel e0d8db05b8 Created alphabetic and numerical sort tool for collection operations 2017-07-21 15:54:09 +02:00
mvdbeek 5cc71d2e3c Simplify vcf_bgzip.xml test wrapper and fix index file access 2017-07-07 18:29:29 +03:00
mvdbeek 77b948678d Add vcf_bgzip and dependent datatypes to test/functional/tools/sample_datatypes_conf.xml 2017-07-07 18:29:29 +03:00
Peter van 't Hof ed2e71a838 Fixing tool format 2017-07-07 18:29:05 +03:00
Peter van 't Hof e29611f52d Fixing formats in test 2017-07-07 18:29:05 +03:00
Peter van 't Hof 9d98f10767 Adding test tool 2017-07-07 18:29:05 +03:00
Nicola Soranzo 9eb3c0f40a Merge branch 'release_17.05' into dev
Conflicts:
	static/style/blue/base.css
	test/functional/tools/sample_datatypes_conf.xml
2017-07-05 16:19:10 +01:00
Nicola Soranzo d0893b91ae Merge branch 'release_17.01' into release_17.05 2017-07-05 15:36:16 +01:00
Nicola Soranzo bfb3ce6e79 Merge branch 'release_16.10' into release_17.01
Conflicts:
	test/functional/tools/sample_datatypes_conf.xml
2017-07-05 15:34:41 +01:00
Nicola Soranzo fada8d2a60 Merge branch 'release_16.07' into release_16.10 2017-07-05 15:05:28 +01:00
Nicola Soranzo 0ff61d9ffc Fix Registry.get_datatype_by_extension() to return None if ext is unknown
Without this fix, the Cheetah expression:

$dataset.is_of_type('unknown_ext')

in a tool command would be equivalent to:

$dataset.is_of_type('txt')

meaning that if the dataset datatype is a subclass of Text, the expression
would evaluate to True without any warning.

xref. https://github.com/galaxyproject/tools-iuc/issues/1373

Also add missing `xml` datatype to
`test/functional/tools/sample_datatypes_conf.xml` which is needed by 3 test
tools.
2017-06-26 13:44:36 +01:00
Nicola Soranzo 0bfa1df72f Fix Registry.get_datatype_by_extension() to return None if ext is unknown
Without this fix, the Cheetah expression:

$dataset.is_of_type('unknown_ext')

in a tool command would be equivalent to:

$dataset.is_of_type('txt')

meaning that if the dataset datatype is a subclass of Text, the expression
would evaluate to True without any warning.

xref. https://github.com/galaxyproject/tools-iuc/issues/1373

Also add missing `xml` datatype to
`test/functional/tools/sample_datatypes_conf.xml` which is needed by 3 test
tools.
2017-06-26 00:43:41 +01:00
Dannon Baker d779622138 Merge with current dev. 2017-06-14 10:40:02 -04:00
John Chilton 51219f0db0 Add a test tool for mulled containers with versionless requirements. 2017-06-08 15:42:28 -04:00
Dannon Baker ae76200b08 Merge remote-tracking branch 'upstream/release_17.05' into dev 2017-06-06 15:52:49 -04:00
Martin Cech 0b1eaf3269 fix - remove extra slash 2017-06-06 14:27:42 -04:00
E Rasche 2f992d90ae Rebase 2017-06-01 16:43:21 +00:00
Martin Cech 5eadd4842d Merge branch 'release_17.05' into dev 2017-05-16 15:55:16 -04:00
Martin Cech 96a219840c add indentation to for cycle content 2017-05-16 14:10:53 -04:00
Eric Rasche 5e880815ad Use galaxy.root by default 2017-05-14 16:02:09 +00:00
John Chilton 9d48c34a09 Add some test tools for collection job failures.
xref #4032

These at least verify that jobs are properly failing whether they use dynamic dataset collection or not. In the case of pre-determinable list structures - they properly go red and expose the problems to the user (try running test/functional/tools/collection_creates_list_fail.xml manually). In the case of dynamic dataset collections - this does not occur though - all the resulting datasets are indeed green.
2017-05-09 09:14:45 -04:00
Evgeny Anatskiy 68ab3cfcac upload tool's test data into the History panel 2017-04-25 23:28:56 +02:00
John Chilton 49abfced09 Implement collection operation for filtering lists from a file. 2017-04-17 17:08:25 -04:00
John Chilton 9b6a9dc0c7 Start work on a relabelling collection operation.
I think it needs to be touched up but the basic operation seems to work so far. I think what remains to be done is:

 - Validate uniqueness of identifiers and provide nice messages if they are not unique.
 - Validate that at least the required number of lines are present in the file and provide a nice message if not.
 - Add strict mode to ensure exactly the correct number of lines is added.
 - Find where validation of identifiers happens in the API and apply same validation here - try not to let unsafe identifiers be created.
 - Consider more advanced modes - selecting a column, apply a regex replace, pick two columns for nested lists, etc.... None of this may need to be needed in the first iteration.
 - Consider another mode where a collection is labelled against an existing collection - should that be a separate tool of the same tool.
2017-04-13 23:11:49 -04:00
Nicola Soranzo 41a88de752 Merge branch 'release_17.01' into dev
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
2017-04-04 15:07:31 +01:00
John Chilton 5b46c431b4 Fix certain aspects of dataset reductions in conditionals/repeats.
For instance, fixes #3859 restoring the correct ``element_identifier`` for reduces collections in conditionals. Add tests for combinations of repeats and conditionals.
2017-04-03 12:19:18 -04:00
John Chilton 009e2cbf5e Improve interaction between job state and purged datasets.
There are two basic behavior changes here and bunch of testing to verify the new behaviors.

1) Previously purging a dataset would cause a creating job to be cancelled but all outputs would need to be "deleted" in order to cause the creating job to be cancelled. After this change the behavior is the same for both deletion and purging - the job will run until all outputs are deleted or purged.

2) Previously Galaxy jobs wouldn't attempt to cleanup purged datasets that were created by a running tool - this cleanup now occurs.

These are tackled as a pair because I assume the difference in the behaviors between deletion and purging was a hack around tools populating datasets that had been purged while running. Cancelling the job wasn't a sure fix - but it would reduce the likelihood of such problems. I think the new approach is a bit more robust and explicit.
2017-03-20 10:58:23 -04:00
Martin Cech 387805fc13 Merge branch 'release_17.01' into dev
Conflicts:
	client/galaxy/scripts/mvc/tool/tool-form-composite.js
    preserved the dev version

	static/maps/mvc/tool/tool-form-composite.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/tool/tool-form-composite.js
2017-02-22 10:54:08 -05:00
John Chilton 0024aa4582 Add a clarification to new test tool. 2017-02-20 11:58:11 -05:00
John Chilton 1e3c9ab945 More revisions to fixing --offline mode to Conda.
Incorporate package extraction fixes thanks to @nsoranzo, the fix for version 4.1 and 4.0 thanks to @mvdbeek, a comment for @bgruening and a new test tool that makes it a bit easier to test this.
2017-02-20 09:41:46 -05:00