diff options
| author | Eric Avdey <eiri@eiri.ca> | 2017-11-30 13:17:35 -0400 |
|---|---|---|
| committer | Eric Avdey <eiri@eiri.ca> | 2017-11-30 14:45:30 -0400 |
| commit | b66e52ab9992654e1cb5ac626f0427270f0fd122 (patch) | |
| tree | 897e308ab7cbb7bcb1ac42817677747b4d0edae8 | |
| parent | 3e511b37bde8238918edc18c1bed9ab7ca1cbc5f (diff) | |
| download | couchdb-b66e52ab9992654e1cb5ac626f0427270f0fd122.tar.gz | |
Add missing methods to fake index
Mocked index module missing a couple of methods
called on late compaction stages. This leads
to a crash, but since it's happening after
the test's assertions, it bring the test to fail.
Also small refactoring to encapsulate all mocking
in a single function and move unrelated parts
back to test's setup.
| -rw-r--r-- | src/couch_index/test/couch_index_compaction_tests.erl | 12 | ||||
| -rw-r--r-- | src/couch_index/test/couch_index_ddoc_updated_tests.erl | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/couch_index/test/couch_index_compaction_tests.erl b/src/couch_index/test/couch_index_compaction_tests.erl index 062be872a..164e9836a 100644 --- a/src/couch_index/test/couch_index_compaction_tests.erl +++ b/src/couch_index/test/couch_index_compaction_tests.erl @@ -21,12 +21,12 @@ setup() -> DbName = ?tempdb(), {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]), couch_db:close(Db), - {ok, IndexerPid} = fake_index(Db), + fake_index(DbName), + {ok, IndexerPid} = couch_index_server:get_index(test_index, Db, undefined), ?assertNot(is_opened(Db)), {Db, IndexerPid}. -fake_index(Db) -> - DbName = couch_db:name(Db), +fake_index(DbName) -> ok = meck:new([test_index], [non_strict]), ok = meck:expect(test_index, init, ['_', '_'], {ok, 10}), ok = meck:expect(test_index, open, fun(_Db, State) -> @@ -45,8 +45,10 @@ fake_index(Db) -> (update_seq, Seq) -> Seq end), - - couch_index_server:get_index(test_index, Db, undefined). + ok = meck:expect(test_index, close, ['_'], ok), + ok = meck:expect(test_index, swap_compacted, fun(_, NewState) -> + {ok, NewState} + end). teardown(_) -> (catch meck:unload(test_index)), 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 d1bbc43d2..aaf36c71f 100644 --- a/src/couch_index/test/couch_index_ddoc_updated_tests.erl +++ b/src/couch_index/test/couch_index_ddoc_updated_tests.erl @@ -121,7 +121,8 @@ fake_index() -> crypto:hash(md5, term_to_binary(DDoc)); (update_seq, Seq) -> Seq - end). + end), + ok = meck:expect(test_index, shutdown, ['_'], ok). get_indexes_by_ddoc(DDocID, N) -> |