diff options
| author | Adam Kocoloski <adam@cloudant.com> | 2011-10-04 13:11:12 -0700 |
|---|---|---|
| committer | Adam Kocoloski <adam@cloudant.com> | 2011-10-04 13:11:12 -0700 |
| commit | da7284ed2844926c7df0efef12ba30d8e2e6d039 (patch) | |
| tree | 10fa2d5cf35bfae4d48fc632924cec98ee02a22a /apps/couch/test | |
| parent | b57aadd742e4f8cc925ba4f005ae658c43a7c5b4 (diff) | |
| parent | 4e19639a64d3033e1cc7c22a0b7404d277643c78 (diff) | |
Merge pull request #67 from cloudant/12645-merge_latest_1.1.x
Diffstat (limited to 'apps/couch/test')
| -rwxr-xr-x | apps/couch/test/etap/020-btree-basics.t | 13 | ||||
| -rw-r--r-- | apps/couch/test/javascript/run.tpl | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/apps/couch/test/etap/020-btree-basics.t b/apps/couch/test/etap/020-btree-basics.t index 996d240a..c65d79c2 100755 --- a/apps/couch/test/etap/020-btree-basics.t +++ b/apps/couch/test/etap/020-btree-basics.t @@ -128,6 +128,7 @@ test_btree(Btree, KeyValues) -> ok = test_key_access(Btree, KeyValues), ok = test_lookup_access(Btree, KeyValues), ok = test_final_reductions(Btree, KeyValues), + ok = test_traversal_callbacks(Btree, KeyValues), true. test_add_remove(Btree, OutKeyValues, RemainingKeyValues) -> @@ -188,6 +189,18 @@ test_final_reductions(Btree, KeyValues) -> KVLen = FoldLRed + FoldRRed, ok. +test_traversal_callbacks(Btree, KeyValues) -> + FoldFun = + fun + (visit, GroupedKey, Unreduced, Acc) -> + {ok, Acc andalso false}; + (traverse, _LK, _Red, Acc) -> + {skip, Acc andalso true} + end, + % With 250 items the root is a kp. Always skipping should reduce to true. + {ok, _, true} = couch_btree:fold(Btree, FoldFun, true, [{dir, fwd}]), + ok. + shuffle(List) -> randomize(round(math:log(length(List)) + 0.5), List). diff --git a/apps/couch/test/javascript/run.tpl b/apps/couch/test/javascript/run.tpl index c5abe6e7..1389a4f9 100644 --- a/apps/couch/test/javascript/run.tpl +++ b/apps/couch/test/javascript/run.tpl @@ -27,4 +27,4 @@ cat $SCRIPT_DIR/json2.js \ $SCRIPT_DIR/test/*.js \ $JS_TEST_DIR/couch_http.js \ $JS_TEST_DIR/cli_runner.js \ - | $COUCHJS - + | $COUCHJS --http - |