summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Avdey <eiri@eiri.ca>2017-11-30 13:25:01 -0400
committerEric Avdey <eiri@eiri.ca>2017-11-30 14:45:30 -0400
commitccb657ea736d21c35ff967cabad149ee5bda4431 (patch)
tree569ffbf96a721e04267c0e64a37d2dbc6264ca53
parentb66e52ab9992654e1cb5ac626f0427270f0fd122 (diff)
downloadcouchdb-ccb657ea736d21c35ff967cabad149ee5bda4431.tar.gz
Remove invalid meck unload
Remove invalid meck unload and catch around unload that was hiding this issue.
-rw-r--r--src/couch_index/test/couch_index_compaction_tests.erl4
-rw-r--r--src/couch_index/test/couch_index_ddoc_updated_tests.erl2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/couch_index/test/couch_index_compaction_tests.erl b/src/couch_index/test/couch_index_compaction_tests.erl
index 164e9836a..53316d944 100644
--- a/src/couch_index/test/couch_index_compaction_tests.erl
+++ b/src/couch_index/test/couch_index_compaction_tests.erl
@@ -51,9 +51,7 @@ fake_index(DbName) ->
end).
teardown(_) ->
- (catch meck:unload(test_index)),
- (catch meck:unload(couch_util)),
- ok.
+ meck:unload(test_index).
compaction_test_() ->
{
diff --git a/src/couch_index/test/couch_index_ddoc_updated_tests.erl b/src/couch_index/test/couch_index_ddoc_updated_tests.erl
index aaf36c71f..40dadcc62 100644
--- a/src/couch_index/test/couch_index_ddoc_updated_tests.erl
+++ b/src/couch_index/test/couch_index_ddoc_updated_tests.erl
@@ -25,7 +25,7 @@ start() ->
stop({Ctx, DbName}) ->
- (catch meck:unload(test_index)),
+ meck:unload(test_index),
ok = fabric:delete_db(DbName, [?ADMIN_CTX]),
DbDir = config:get("couchdb", "database_dir", "."),
WaitFun = fun() ->