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

Fix integration database encoding issue with templated database stuff. #4914

Merged
merged 1 commit into from Nov 1, 2017

Conversation

Projects
None yet
3 participants
@jmchilton
Member

jmchilton commented Nov 1, 2017

This is causing all integration tests to fail against dev currently (sorry everyone).

So #4900 and #4887 were both fine on their own - but there is a bad interaction together as #4900 fixed a bug in #4887 that actually allowed the database templating stuff to start working without actually fixing that process. This fix is from my working branch in #4763 (which contained both #4900 and #4887) and the integration tests worked. You can actually see in #4900 the new Docker image enables this new option.

@jmchilton

This comment has been minimized.

Member

jmchilton commented Nov 1, 2017

... and these remaining failures are fixed by #4910 which is not yet merged. These seemed like very different pull requests but were clearly more interconnected than I meant them to be.

jmchilton added a commit to jmchilton/galaxy that referenced this pull request Nov 1, 2017

Rollback isolated, templated databases for integration tests.
Integration tests are broken in dev - they can be fixed by merging galaxyproject#4914 and galaxyproject#4910 or by this commit. If those PRs are merged first (my preference) I'll just close this one. If not, I'll open a fourth PR to roll this back after those are merged.

@galaxybot galaxybot added this to the 18.01 milestone Nov 1, 2017

@dannon dannon merged commit c0a3148 into galaxyproject:dev Nov 1, 2017

6 checks passed

api test Build finished. 306 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 162 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 57 tests run, 0 skipped, 0 failed.
Details
lgtm analysis: JavaScript No alert changes
Details
toolshed test Build finished. 577 tests run, 0 skipped, 0 failed.
Details

@jmchilton jmchilton referenced this pull request Nov 2, 2017

Merged

Run Galaxy fully under uWSGI, including job handlers #4475

14 of 14 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment