couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [couchdb] 02/02: Remove invalid meck unload
Date Thu, 30 Nov 2017 18:45:36 GMT
This is an automated email from the ASF dual-hosted git repository.

eiri pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit ccb657ea736d21c35ff967cabad149ee5bda4431
Author: Eric Avdey <eiri@eiri.ca>
AuthorDate: Thu Nov 30 13:25:01 2017 -0400

    Remove invalid meck unload
    
    Remove invalid meck unload and catch around unload
    that was hiding this issue.
---
 src/couch_index/test/couch_index_compaction_tests.erl   | 4 +---
 src/couch_index/test/couch_index_ddoc_updated_tests.erl | 2 +-
 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 164e983..53316d9 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 aaf36c7..40dadcc 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() ->

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <commits@couchdb.apache.org>.

Mime
View raw message