summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Vatamaniuc <vatamane@apache.org>2018-01-15 17:32:46 -0500
committerNick Vatamaniuc <vatamane@apache.org>2018-01-15 17:49:56 -0500
commita1a759d31fabf6303084a35a3ecec2b520935836 (patch)
tree39b56c78e1282c4f549214d8c5fed9548d1af1b4
parent49265987f047d20e6d57cbcc81c9a373bb236166 (diff)
downloadcouchdb-optimize-doc-updates-3.tar.gz
Fix should_create_no_conflicts_on_full_stem test caseoptimize-doc-updates-3
Add comment explaining how full stem will be run in the repair_tree function when a common tree node is found.
-rw-r--r--src/couch/test/couch_key_tree_tests.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/couch/test/couch_key_tree_tests.erl b/src/couch/test/couch_key_tree_tests.erl
index 53e783251..905c99004 100644
--- a/src/couch/test/couch_key_tree_tests.erl
+++ b/src/couch/test/couch_key_tree_tests.erl
@@ -241,11 +241,14 @@ should_create_conflicts_on_merge()->
couch_key_tree:merge([OneChild], Stemmed, ?DEPTH)).
should_create_no_conflicts_on_full_stem()->
+ %% Full stem is run from couch_key_tree:repair_tree/2. That is triggered
+ %% when a matching node ("1aa") is found in the rev tree and the tree to
+ %% be merged.
OneChild = {1, {"1","foo",[{"1a", "bar", []}]}},
Stemmed = {3, {"1aa", "bar", []}},
TwoChild = {1, {"1","foo", [{"1a", "bar", [{"1aa", "bar", []}]}]}},
{Merged, new_leaf} = couch_key_tree:merge([OneChild, Stemmed], TwoChild),
- ?_assertEqual([TwoChild], couch_key_tree:full_stem(Merged, ?DEPTH)).
+ ?_assertEqual([TwoChild], couch_key_tree:stem(Merged, ?DEPTH)).
should_ignore_conflicting_branch()->
%% this test is based on couch-902-test-case2.py