Commit Graph
1812 Commits
Author SHA1 Message Date
Martin Cech c3e4ae11b0 set client_encoding for TS dockerized test db 2015-12-09 11:37:31 -05:00
Martin Cech 6d16549a46 Merge pull request #1262 from carlfeberhard/fix.js-app-mako
Managers, users: properly return a boolean from has_requests
2015-12-08 12:44:36 -05:00
Martin Cech fe1c9dd293 Merge pull request #1251 from jmchilton/workflow_labels_2
Workflow Editor UI for Step Labels
2015-12-08 12:04:26 -05:00
carlfeberhard 38a9aa6a5c Managers, users: update serialized key 'requests' to 'has_requests', update test 2015-12-08 11:43:15 -05:00
John Chilton c14c45be46 Further cache user roles across batched tool executions. 2015-12-06 14:32:05 +00:00
John Chilton e3161b4671 Add support for workflow step labels in editor.
- If a step has a label, display it in the step editor side panel title.
 - Allow clicking the title to change the label.
 - Display the label (if set) as the workflow node box title.
 - Add icon to workflow node since the title might not be related to type anymore.
 - Enforce unique labels accross the workflow in the editor.
 - Qunit test cases for some of this behavior and other recent changes.
2015-12-06 12:27:13 +00:00
John Chilton f6d26c9ee6 Small refactor making workflow views and modules tad more generic.
- Reduce duplication between initializing generic modules and tool modules.
 - Switch tool_id to content_id as variable names throughout the client.
 - Rename get_tool_id to get_content_id on workflow modules.
 - Add some minimal documentation to the workflow module about get_content_id.

Downstream in the subworkflow commit I switch the over-the-wire communication to use content_id instead of tool_id also and use content_ids to refer to workflow ids in subworkflow moduls.
2015-12-06 10:43:09 +00:00
John Chilton 2aa7f04364 Replace __rip_value with dict.pop.
Thanks @bgruening.
2015-12-06 09:50:55 +00:00
John Chilton b11002bef3 Don't iterate over unused key.
Thanks to @bgruening.
2015-12-06 09:50:55 +00:00
Björn Grüning fef8ce2a76 Merge pull request #1248 from jmchilton/maxseconds_debug_2
Attempt to fix transiently failing tool test on Jenkins
2015-12-06 00:57:42 +01:00
Björn Grüning df64706544 Merge pull request #1237 from jmchilton/test_jobs_fix
Fix missing assertion pointed out @nsoranzo.
2015-12-06 00:57:11 +01:00
Björn Grüning 4d252119fd Merge pull request #1216 from jmchilton/workflow_tweaks_1
More small workflow tweaks.
2015-12-05 21:38:34 +01:00
Björn Grüning 6126bd0e93 Merge pull request #1214 from jmchilton/format_2_1
Small enhancements in workflow inputs and outputs
2015-12-05 21:37:50 +01:00
Björn Grüning d7f5dbe4ca Merge pull request #805 from jmchilton/multi_data_param_enhance
Allow multiple collections to be supplied to a multiple data parameter.
2015-12-05 20:09:10 +01:00
John Chilton cae457d8c1 Fail maxseconds test tool if sleep is interrupted. 2015-12-05 18:13:07 +00:00
Martin Cech b0c1cd7460 Merge pull request #1243 from jmchilton/maxseconds_debug
Improved logging related tool test timeouts.
2015-12-05 00:29:27 -05:00
John Chilton 17851ba0ea And fix unit test for b036adcaa166153e544935c12123877c69a7450f. 2015-12-04 20:41:22 +00:00
John Chilton c91a2eb339 Multi data parameter improvements.
Allow multiple collections to be fed to a multi data parameter in one reduction step. Fixes #750 and will really simplify certain classes of tools.

Rebased original with fixes for rerun of such reductions.

Manually tested workflow execution and everything seems fine. The workflow editor already thought this was possible, so that is another bug corrected by this enhancement.

To run the associated API test, execute the following command:

./run_tests.sh -with_framework_test_tools -api test/api/test_tools.py:ToolsTestCase.test_reduce_multiple_lists_on_multi_data

Conflicts:
	static/maps/mvc/dataset/dataset-choice.js.map
	static/maps/mvc/form/form-select-content.js.map
	static/scripts/mvc/form/form-select-content.js
2015-12-04 20:41:21 +00:00
John Chilton 40e6932a25 Fix workflow API tests for workflow output changes. 2015-12-04 20:37:37 +00:00
John Chilton 7b3fa824b6 Update worklfow editor representation of workflow outputs.
Modified this for the workflow export representation but this needed to be updated for the workflow editor because they shared some code in the manager. This was going to be needed downstream when I add labels and uuids to workflow outputs anyway.
2015-12-04 20:36:18 +00:00
John Chilton a597e0e834 Implement workflow outputs for format 2 workflow definitions.
Copy CWL style of specifying a outputs specification block at the top-level of the workflow specification and within that use the "source" attribute to specify the output. Reuse the specification used by "$link"s to describe this output - namely <label_or_order_index>[#<output_name=output>].
2015-12-04 20:34:57 +00:00
John Chilton 1bd0a4e970 Refactoring and more testing of format 2 workflow implementation code...
... toward more reusable design.
2015-12-04 20:34:57 +00:00
John Chilton 70a9f21393 Update workflow format 2 code with infrastructure for nesting runnables.
In downstream work this is used for subworkflows and nested tools. Not sure which of these would potentially hit main line Galaxy first so setting this all up in its own commit.
2015-12-04 20:34:57 +00:00
John Chilton b0b26e6901 Allow specifying Format 2 workflow by path.
This will allow importing workflow relative resources in subsequent passes at this.
2015-12-04 20:34:56 +00:00
John Chilton 4a279ffb64 Allow inputs section for Format 2 workflow definitions.
Arguably a more natural way to define inputs, regardless it allows more CWL-like input definitions for workflows.
2015-12-04 20:34:56 +00:00
John Chilton 0924891e31 Fix up merge issue with double underscore shim. 2015-12-04 20:33:01 +00:00
carlfeberhard 9e8068f367 (merge dev) 2015-12-04 13:17:29 -05:00
Martin Cech 905471e32f Merge pull request #1226 from jmchilton/jobs_api_test_fix
Wait on jobs and history in certain API test cases.
2015-12-04 11:33:35 -05:00
carlfeberhard 5c87d07e0f Merge pull request #1233 from jmchilton/underscore_shim
Fix qunit shim to match base_panels.mako shim.
2015-12-04 11:29:17 -05:00
John Chilton bab7ae0998 Improved logging related tool test timeouts.
There are transient failures of maxseconds.xml's tool test on Jenkins that I can't reproduce locally, hopefully improved logging will help.

https://jenkins.galaxyproject.org/job/docker-framework/1309/testReport/junit/functional.test_toolbox/TestForTool_maxseconds/test_tool_000000/
2015-12-04 16:06:01 +00:00
John Chilton df781dcc18 Fix missing assertion pointed out @nsoranzo.
Lots of other tests would fail if simple uploads aren't working, but it is better to be direct and very explicit about why this particular test is failing.
2015-12-04 12:42:49 +00:00
John Chilton f969eabf26 Fix qunit shim to match base_panels.mako shim.
QUnit tests of things with underscore require statements would not work without this change.
2015-12-04 11:24:43 +00:00
Nicola Soranzo 11c46f4f35 Merge branch 'master' into dev 2015-12-04 09:37:28 +00:00
Martin Cech 9a1fc647a3 Merge pull request #1212 from jmchilton/tool_opts_6
Smaller Tool Optimization PR
2015-12-03 16:23:41 -05:00
Nicola Soranzo c9abc2bc97 Fix for test/tool_shed/functional/test_1440_missing_env_sh_files.py .
Properly order the installation of the repositories adding
prior_installation_required="True". Otherwise filter_1440 is installed first
and ends in INSTALLED status because of the logic of
Repository.create_tool_dependency_with_initialized_env_sh_file() method
contained in
lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py .
2015-12-03 20:00:22 +00:00
John Chilton 1adff983f2 Wait on jobs and history in certain API test cases.
This strategy proved to work around certain race conditions in tool testing so hopefully it will solve the transiently failing job searching and filtering test cases.
2015-12-03 16:33:45 +00:00
Nicola Soranzo 20b96d883d Merge pull request #1202 from jmchilton/workflow_tool_refactoring
Small Tool and Workflow Refactoring and Fixes
2015-12-03 15:53:22 +00:00
John Chilton 59944046b7 Fix for workflow progress unit testing. 2015-12-03 11:32:24 +00:00
John Chilton 64b7cc9fef Add sample tool that creates 10 outputs. 2015-12-03 10:16:12 +00:00
John Chilton dd5f3aec52 Fix workflow extraction test cases broken with 77ed5681f8 2015-12-03 09:55:45 +00:00
carlfeberhard cfdbf8c0e7 Testing, webpack: correct name of Galaxy module in qunit, properly call require, pass GalaxyApp data 2015-12-02 12:49:02 -05:00
carlfeberhard 002bc6b40a (merge dev) 2015-12-02 12:00:51 -05:00
Martin Cech ffb3de9ede Merge pull request #1153 from jmchilton/collection_type_source
Implement type_source on output collections.
2015-12-02 00:14:08 -05:00
John Chilton 48340b5829 Add TODO items to workflow progress unit tests. 2015-12-01 23:44:26 +00:00
John Chilton 07c3d10f31 Extend workflow recovery progress test case to include replacement check. 2015-12-01 23:44:26 +00:00
John Chilton 7974c1f334 Add unit tests for workflow progress initialization. 2015-12-01 23:44:26 +00:00
John Chilton cf367ff0c7 Add another workflow progress test case.
This one for replacing a tool input with an input dataset.
2015-12-01 23:44:26 +00:00
John Chilton 031a39aba8 Basic unit tests for workflow progress tracking. 2015-12-01 23:44:26 +00:00
John Chilton 21213ef70f Refactor workflow testing code to quickly bootstrap workflows. 2015-12-01 23:44:26 +00:00
John Chilton 28501ab676 Refactor workflow manager for extension. 2015-12-01 23:44:25 +00:00