Commit Graph
340 Commits
Author SHA1 Message Date
Martin Cech ffed281c33 Merge pull request #3988 from jmchilton/job_test_timing_improvements
Attempted fix for transiently failing API test_jobs introduced in #3619.
2017-04-30 12:14:11 -04:00
John Chilton 8b21e65196 Improve implicit workflow connection test case.
I think https://jenkins.galaxyproject.org/job/docker-api/7316/testReport/junit/api.test_workflows/WorkflowsApiTestCase/test_run_with_implicit_connection/ may be the first time I have seen it fail - but still it has some other problems.

- Eliminate the sleep - instead wait on explicitly on the desired condition (first two jobs are complete and the workflow is ready for unpause). This is likely why the test case failed.
- Improve the other assertions to provide more details in the test case ever fails again.
2017-04-28 09:01:00 -04:00
John Chilton b12b951e91 Attempted fix for transiently failing API test_jobs introduced in #3619.
A couple things need to occur while the jobs are "running" and it seems that 60 seconds wasn't enough time to sleep for all that to happen on Jenkins.
 I checked the timing in the raw logs (they are for some reasons being filtered out in the Jenkins display of the XUnit) - and indeed the jobs are properly sleeping the correct amount of time but the client API calls need some more time it seems. My initial thought was maybe the jobs were being interrupted or something - and that does not appear to be the case.
2017-04-27 15:41:12 -04:00
Nicola Soranzo d398c90dbd Merge branch 'release_17.01' into dev
Conflicts:
	static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js
2017-04-26 19:05:28 +01: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 8e0be5089c [17.01] Fix collection operations in workflows.
Due to a couple bugs things weren't being delayed correctly for some of these tools in some workflows.
2017-04-03 14:50:05 -04:00
John Chilton 1e70211fa4 Touch up #3559 based on post-merge discussions. 2017-04-03 12:35:57 -04: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 5dcc0ed043 Clean up old TODO into history tests.
We upgraded the module a long time ago now that was referenced in the Trello card.
2017-03-31 14:46:37 -04:00
Dannon Baker ad2e6473bc Merge remote-tracking branch 'upstream/release_17.01' into dev 2017-03-31 08:38:40 -07:00
Dannon Baker bf6b65f005 Merge pull request #3830 from jmchilton/1701_order_collection_invocation_processing
[17.01] Order processing evaluation of workflow invocations when scheduling.
2017-03-31 08:38:23 -07:00
Dannon Baker 200e475bc7 Merge pull request #3849 from jmchilton/improved_scheduling_delay_logging
Log reason when workflow scheduling of a step is delayed.
2017-03-30 15:29:40 -07:00
Dannon Baker 94c357f608 Merge branch 'release_17.01' into dev 2017-03-30 13:44:42 -07:00
John Chilton 185aa3968b Log when workflow scheduling is delayed about why.
Currently the logs contain fairly uninformative step delayed messages that don't allow admins to understand why parts of the workflow are being delayed during scheduling.

Here are some examples of before and after.

When running the test:

```
./run_tests.sh -api test/api/test_workflows.py:WorkflowsApiTestCase.test_workflow_pause
```

Before these lines would show up:

```
galaxy.workflow.run DEBUG 2017-03-30 09:23:47,327 Workflow step 2 of invocation 1 invoked (174.149 ms)
galaxy.workflow.run DEBUG 2017-03-30 09:23:47,347 Workflow step 3 of invocation 1 invoked (19.355 ms)
galaxy.workflow.run DEBUG 2017-03-30 09:23:47,364 Workflow step 4 of invocation 1 delayed (16.262 ms)
```

Now these same lines are as follows:

```
galaxy.workflow.run DEBUG 2017-03-30 09:19:28,601 Workflow step 2 of invocation 1 invoked (172.849 ms)
galaxy.workflow.run DEBUG 2017-03-30 09:19:28,619 Marking step 3 outputs delayed (executing pause step)
galaxy.workflow.run DEBUG 2017-03-30 09:19:28,620 Workflow step 3 of invocation 1 invoked (17.999 ms)
galaxy.workflow.run DEBUG 2017-03-30 09:19:28,633 Workflow step 4 of invocation 1 delayed (dependent step [3] delayed, so this step must be delayed) (13.398 ms)
```

Also, when running the test:

```
./run_tests.sh -api test/api/test_workflows.py:WorkflowsApiTestCase.test_workflow_run_dynamic_output_collections_3
```

Before these lines would be printed:

```
galaxy.workflow.run DEBUG 2017-03-30 09:25:35,910 Workflow step 4 of invocation 1 invoked (281.479 ms)
galaxy.workflow.run DEBUG 2017-03-30 09:25:35,937 Workflow step 5 of invocation 1 delayed (25.904 ms)
galaxy.workflow.run DEBUG 2017-03-30 09:25:35,970 Workflow step 6 of invocation 1 delayed (32.597 ms)
```

Now these same lines are as follows:

```
galaxy.workflow.run DEBUG 2017-03-30 09:27:54,270 Workflow step 4 of invocation 1 invoked (295.826 ms)
galaxy.workflow.run DEBUG 2017-03-30 09:27:54,315 Workflow step 5 of invocation 1 delayed (dependent collection [1] not yet populated with datasets) (44.581 ms)
galaxy.workflow.run DEBUG 2017-03-30 09:27:54,326 Workflow step 6 of invocation 1 delayed (dependent step [5] delayed, so this step must be delayed) (10.804 ms)
```

When running workflows with steps that depend explicitly on other steps (instead of implicitly between dataset connections), lines such as:

```
galaxy.workflow.run DEBUG 2017-03-30 09:33:52,966 Marking step 3 outputs delayed (workflow paused at this step waiting for review)
galaxy.workflow.run DEBUG 2017-03-30 09:33:53,001 Workflow step 4 of invocation 1 delayed (dependent step [3] delayed, so this step must be delayed) (0.157 ms)
galaxy.workflow.run DEBUG 2017-03-30 09:33:53,001 Workflow step 5 of invocation 1 delayed (depends on step [4] but that step has not been invoked yet) (0.084 ms)
```

and

```
galaxy.workflow.run DEBUG 2017-03-30 09:33:57,090 Workflow step 5 of invocation 1 delayed (depends on step [4] but one or more jobs created from that step have not finished yet) (0.144 ms)
```

now may appear.
2017-03-30 12:58:45 -04:00
John Chilton 4beb98e973 [17.01] By default, do not allow workflow invocations to schedule indefinitely.
Give up after a month but allow admins to reduce this amount as well.
2017-03-29 22:19:13 -04:00
John Chilton 5d3250fac0 [17.01] Order processing evaluation of workflow invocations when scheduling.
xref https://github.com/galaxyproject/galaxy/pull/3820#issuecomment-289725795

Also optimize the query to just pull out workflow invocation IDs per the suggestion of @nsoranzo [here](https://github.com/galaxyproject/galaxy/pull/3830#pullrequestreview-29473700).
2017-03-28 13:31:07 -04:00
Martin Cech 810a96caef Merge branch 'dev' into collection_builder_enhancements 2017-03-27 17:11:42 -04:00
Martin Cech 967d0b6c0a Merge pull request #3619 from jmchilton/purge_jobs_rework
Improve interaction between job state and purged datasets.
2017-03-27 16:49:54 -04:00
John Chilton c9d06aeb41 Allow collection creation API to hide original datasets during creation. 2017-03-24 10:06:43 -04:00
Martin Cech b82d7311c1 Merge pull request #3786 from jmchilton/zip_edit
Fix collection operations not having a history.
2017-03-23 14:56:24 -04:00
John Chilton 79b26d2273 Fix collection operations not having a history.
Fixes #3437.
2017-03-21 14:54:26 -04:00
Martin Cech 234361253a Merge branch 'dev' into add_hdca_to_library 2017-03-21 11:47:47 -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
John Chilton f153400e95 Rework jobs API to not use deprecated TestsDatasets mixin. 2017-03-20 10:19:30 -04:00
John Chilton 075d53af92 Fix for transiently failing workflow test.
The history can be complete before a workflow has fully scheduled if the workflow still has more jobs to schedule but all the current ones are complete.
2017-02-24 15:17:54 -05:00
John Chilton 0278753d0e Increase patience of Galaxy tests throughout.
This should help reduce various API and Selenium transient failures.
2017-02-21 07:42:58 -05:00
John Chilton 1922d50f90 Increase patience of Galaxy tests throughout.
This should help reduce various API and Selenium transient failures.
2017-02-10 10:39:27 -05:00
Nicola Soranzo b215ea1eed Sync API history purge with hda implementation
Add API and unit test cases.
Import order and Python3 fixes.
2017-02-08 13:43:07 +00:00
Nicola Soranzo 3b78907fdb Set 'deleted' to True when purging a history dataset association
Fix https://github.com/galaxyproject/galaxy/issues/3548

Add API and unit test cases.
Add migration to fix misaligned databases.
2017-02-07 04:43:20 +00:00
mvdbeek 8b9fd288bc Test creating library datatsets fails when not owning HDA 2017-02-05 15:36:48 +01:00
mvdbeek 08449059f4 Test adding a single dataset to a folder and test creating library using from_hdca_id 2017-02-05 14:36:16 +01:00
mvdbeek e0f80db701 Add possibility to load collections into library
and to conserve element_identifier.
2017-02-04 21:02:29 +01:00
Nicola Soranzo 0b074f3fa5 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.map
2017-02-03 11:44:02 +00:00
Nicola Soranzo 62e6639d47 Fix import order
Broken in commit dd77cdb625 .

Need to remove the file from .ci/flake8_lint_include_list.txt
because 'base' is not in application-import-names
2017-02-02 21:19:58 +00:00
Nicola Soranzo b6cd80a5b3 Merge branch 'release_16.10' into release_17.01 2017-02-02 19:57:15 +00:00
John Chilton 41d4eac28f Merge remote-tracking branch 'jmchilton/dev' into feature/webhooks_tests 2017-01-29 15:40:18 -05:00
mvdbeek 36ecf28ada Use CONVERTER_fasta_to_tabular as example converter (thx @jmchilton) 2017-01-25 17:18:42 +01:00
mvdbeek dd77cdb625 Add API test for converters after toolbox reload 2017-01-25 17:18:41 +01:00
John Chilton 8b30d874b5 Update webhooks API test to set expectations independent of implementation.
It may seem like this is testing less since fewer API calls are being made - but when you use the backend to generate the data you trust in the test case - the correlation lands up meaning relatively less is tested. For instance, if there is some problem arises in the to_dict method of a webhook - it is going to arise in both the implementation and in the test case and so the test case will just be asserting that the response is broken ... and it will be. Testing more concrete things is also good for ensuring backward compatibility.
2017-01-24 12:23:44 -05:00
Evgeny Anatskiy 809c087a8a - add Webhooks tests
- small code improvements
2017-01-24 01:20:28 +01:00
guerler 84d9e171bc Merge branch 'fix_workflow_issues' of https://github.com/guerler/galaxy into fix_workflow_issues 2017-01-14 18:07:32 -05:00
John Chilton d1eeafcc8f Test case d1cf0def31. 2017-01-09 15:20:34 -05:00
guerler 48ba525eb5 Merge branch 'dev' into fix_workflow_issues 2017-01-08 12:36:53 -05:00
John Chilton de35c85b65 Refactor API helpers for re-use in rest of test framework.
- Move api.helpers to base.populators.
- Refactor helper subclasses adapted to use bioblend instead of test framework stuff into base.populators for greater visibility.
- Refactor workflow format 2 testing stuff for reuse by Selenium.
2017-01-08 08:13:42 -05:00
Björn Grüning dad4c60d85 Merge pull request #3381 from jmchilton/rename_improvements
Test cases & small enhancement to workflow renaming PJAs.
2017-01-08 14:07:20 +01:00
Björn Grüning 690b512dbd Merge pull request #3288 from jmchilton/casper2api_0
Migrate more CasperJS API tests to the API test framework.
2017-01-08 13:56:25 +01:00
Björn Grüning 9843e404b7 Merge pull request #3377 from jmchilton/upload_fix
Fix upload to respect explicit name override on pasted uploads.
2017-01-08 12:34:02 +01:00
Dannon Baker 387c08b39b Merge branch 'release_16.10' into dev 2017-01-06 11:05:59 -05:00
Dannon Baker 4d73dfc2e0 Merge remote-tracking branch 'upstream/release_16.07' into release_16.10 2017-01-06 10:55:37 -05:00
John Chilton c3687114d6 Set metadata on HDAs from dynamically discovered collections.
With test case that previously failed.

Fixes #3267.
2017-01-05 14:48:53 -05:00