Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.01] Fix certain aspects of collection reductions in conditionals/repeats. #3864

Conversation

Projects
None yet
3 participants
@jmchilton
Copy link
Member

commented Apr 3, 2017

Fixes #3859 and refactors the relevant piece of code with the error in it so I can add a comment for future @jmchilton to describe what is going on.

#end for#
]]></command>
<inputs>
<conditional name="the_data">

This comment has been minimized.

Copy link
@bgruening

bgruening Apr 3, 2017

Member

Should we also test conditionals in conditionals?

This comment has been minimized.

Copy link
@jmchilton

jmchilton Apr 3, 2017

Author Member

I guess - I think repeats might be a better second test though since now that I'm thinking about this I don't think this will work properly with repeats. I'll pull this back into WIP and re-open with a more complete fix.

This comment has been minimized.

Copy link
@jmchilton

jmchilton Apr 3, 2017

Author Member

Okay - I re-did this with some tougher test cases. I'll see how the tests go.

This comment has been minimized.

Copy link
@bgruening

bgruening Apr 3, 2017

Member

Thanks John!

@jmchilton jmchilton added status/WIP and removed status/review labels Apr 3, 2017

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.

@jmchilton jmchilton force-pushed the jmchilton:fix_identifiers_in_conditionals branch from 408044b to 5b46c43 Apr 3, 2017

@bgruening

This comment has been minimized.

Copy link
Member

commented Apr 3, 2017

👍

@jmchilton jmchilton added status/review and removed status/WIP labels Apr 3, 2017

@martenson martenson merged commit 3c080ca into galaxyproject:release_17.01 Apr 3, 2017

5 checks passed

api test Build finished. 260 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 136 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 27 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 580 tests run, 0 skipped, 0 failed.
Details

@jmchilton jmchilton deleted the jmchilton:fix_identifiers_in_conditionals branch Apr 3, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.