diff options
| author | Eric Avdey <eiri@eiri.ca> | 2017-06-23 16:57:24 +0000 |
|---|---|---|
| committer | Eric Avdey <eiri@eiri.ca> | 2017-06-23 18:03:15 +0000 |
| commit | 7105971725f0c6103f088a3d9bf2f8b407b300c7 (patch) | |
| tree | 12b160960ed1528cf31890b87b2ac2129feaa3db | |
| parent | c7f7dcf380e9c90b0e656fa6f52125c574276b3e (diff) | |
| download | couchdb-7105971725f0c6103f088a3d9bf2f8b407b300c7.tar.gz | |
Refactor compaction tests setup and teardown
| -rw-r--r-- | src/couch/test/couchdb_compaction_daemon_tests.erl | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/couch/test/couchdb_compaction_daemon_tests.erl b/src/couch/test/couchdb_compaction_daemon_tests.erl index 09646b381..dcb1b5fe3 100644 --- a/src/couch/test/couchdb_compaction_daemon_tests.erl +++ b/src/couch/test/couchdb_compaction_daemon_tests.erl @@ -36,6 +36,7 @@ setup() -> DbName = ?tempdb(), {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]), create_design_doc(Db), + populate(DbName, 70, 70, 200 * 1024), ok = couch_db:close(Db), meck:reset(?MODS_TO_MOCK), DbName. @@ -47,7 +48,8 @@ teardown(DbName) -> ok = config:delete("compactions", Key, false) end, Configs), - couch_server:delete(DbName, [?ADMIN_CTX]). + couch_server:delete(DbName, [?ADMIN_CTX]), + exit(whereis(couch_index_server), shutdown). compaction_daemon_test_() -> @@ -70,9 +72,6 @@ compaction_daemon_test_() -> should_compact_by_default_rule(DbName) -> {timeout, ?TIMEOUT_S, ?_test(begin - {ok, Db} = couch_db:open_int(DbName, []), - populate(DbName, 70, 70, 200 * 1024), - CompactionMonitor = spawn_compaction_monitor(DbName), {_, DbFileSize} = get_db_frag(DbName), @@ -99,15 +98,11 @@ should_compact_by_default_rule(DbName) -> ?assert(DbFileSize > DbFileSize2), ?assert(ViewFileSize > ViewFileSize2), - ?assert(is_idle(DbName)), - ok = couch_db:close(Db) + ?assert(is_idle(DbName)) end)}. should_compact_by_dbname_rule(DbName) -> {timeout, ?TIMEOUT_S, ?_test(begin - {ok, Db} = couch_db:open_int(DbName, []), - populate(DbName, 70, 70, 200 * 1024), - CompactionMonitor = spawn_compaction_monitor(DbName), {_, DbFileSize} = get_db_frag(DbName), @@ -134,8 +129,7 @@ should_compact_by_dbname_rule(DbName) -> ?assert(DbFileSize > DbFileSize2), ?assert(ViewFileSize > ViewFileSize2), - ?assert(is_idle(DbName)), - ok = couch_db:close(Db) + ?assert(is_idle(DbName)) end)}. |