Adam/resolve merge conflicts #5107
Merged
Conversation
This file contains 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
does too much work on exit and doesn't handle nesting
…ss information here and prevents overflows from happening
…ngs.xxx, allow for microsites to override
Tmporarily disable bulk operations b/c old mongo
Cdodge/white label small hotfixes
escape html for inline discussions (TNL-182)
Hotfix/2014 09 05b
…-conflicts Conflicts: common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
| @@ -901,7 +901,7 @@ def test_get_parent_locations_deleted_child(self, default_ms): | |||
| # TODO: LMS-11220: Document why draft send count is 5 | |||
| # TODO: LMS-11220: Document why draft find count is [19, 6] | |||
| # TODO: LMS-11220: Document why split find count is [2, 2] | |||
| @ddt.data(('draft', [21, 6], 0), ('split', [2, 2], 0)) | |||
| @ddt.data(('draft', [18, 5], 0), ('split', [16, 6], 0)) # FIXME, replace w/ above when bulk reenabled | |||
There was a problem hiding this comment.
@nasthagiri , this was the line with the merge conflict. Does this look right?
There was a problem hiding this comment.
@adampalay The mongo counts could vary +- as the code varies. So we just need to update the test code with the new numbers.
There was a problem hiding this comment.
To fix the test, you need to change 18->20 and 16->17.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.