Merge remote branch 'cloudant:improve-exceeded_recompact_retry_count-error-message'
This closes #59
Signed-off-by: ILYA Khlopotov <iilyak@apache.org>
diff --git a/src/couch_mrview_compactor.erl b/src/couch_mrview_compactor.erl
index e343ac8..5957908 100644
--- a/src/couch_mrview_compactor.erl
+++ b/src/couch_mrview_compactor.erl
@@ -151,8 +151,9 @@
recompact(State) ->
recompact(State, recompact_retry_count()).
-recompact(_State, 0) ->
- erlang:error(exceeded_recompact_retry_count);
+recompact(#mrst{db_name=DbName, idx_name=IdxName}, 0) ->
+ erlang:error({exceeded_recompact_retry_count,
+ [{db_name, DbName}, {idx_name, IdxName}]});
recompact(State, RetryCount) ->
Self = self(),
@@ -321,8 +322,10 @@
fun(_, _, _) ->
exit(error)
end),
- State = #mrst{fd=self()},
- ?assertError(exceeded_recompact_retry_count, recompact(State)),
+ State = #mrst{fd=self(), db_name=foo, idx_name=bar},
+ ExpectedError = {exceeded_recompact_retry_count,
+ [{db_name, foo}, {idx_name, bar}]},
+ ?assertError(ExpectedError, recompact(State)),
meck:unload(couch_index_updater)
end).
