Merge pull request #1646 from apache/eunit-fixes-for-partitions

fixes for failin eunit tests
apache · Oct 8, 2018 · 3e14644 · 3e14644
2 parents cf124b9 + b2c858f
commit 3e14644
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/fabric/src/fabric_view.erl b/src/fabric/src/fabric_view.erl
@@ -338,7 +338,9 @@ get_shards(DbName, #mrargs{} = Args) ->
  {false, true, undefined} ->
  mem3:shards(DbName);
  {false, true, Partition} ->
- mem3:shards(DbName, Partition)
+ mem3:shards(DbName, Partition);
+ {false, undefined, _} ->
+ mem3:shards(DbName)
  end.
 
 % create a fake docid within the specified partition.

diff --git a/src/fabric/src/fabric_view_all_docs.erl b/src/fabric/src/fabric_view_all_docs.erl
@@ -395,7 +395,7 @@ cancel_read_pids(Pids) ->
  Args = #mrargs{
  start_key = null,
  end_key = null,
- extra = [{partitioned, true}]
+ extra = [{partitioned, false}]
  },
  meck:expect(mem3, shards, fun(<<"db">>) -> [] end),
  shards(DbName, Args),

diff --git a/src/mango/src/mango_idx.erl b/src/mango/src/mango_idx.erl
@@ -422,6 +422,7 @@ index(SelectorName, Selector) ->
  <<"Selected">>,<<"json">>,
  {[{<<"fields">>,{[{<<"location">>,<<"asc">>}]}},
  {SelectorName,{Selector}}]},
+ [],
  [{<<"def">>,{[{<<"fields">>,[<<"location">>]}]}}]
  }.