This repository was archived by the owner on Aug 30, 2024. It is now read-only.
27 merge raise for status #28
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
March 4, 2014 14:19
|
LGTM; waiting on Travis and coveralls. |
|
Changes Unknown when pulling 4ba2a0c on ksnavely:27-merge-raise-for-status into * on cloudant-labs:master*. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See here. We've guarded against 404s however couchdb/cloudant will return error JSON for other statuses as well.
This adds a raise_for_status call to the merge function, so an an Exception is raised rather than inadvertently merging error JSON with a document.
I popped into test/ to see if I couldn't cover the error case, but looks like it would behoove us to pull out the tests into individual test modules and toss in a mocking harness to use when ideal. I didn't want to throw a ton of changes into this PR, so take a look and perhaps we can beef up the test suite a bit later.