diff options
| author | Jan Lehnardt <jan@apache.org> | 2017-10-08 16:54:17 +0200 |
|---|---|---|
| committer | Joan Touzet <joant@atypical.net> | 2017-10-10 17:23:37 -0400 |
| commit | 22656c86b3d5f3ad977bb72c4375874403940158 (patch) | |
| tree | c5f0b40049cf0cbe11896c4f5b0c1572b4d9b158 | |
| parent | ee9c8725901696034c2603d6509ef626711dc8b7 (diff) | |
| download | couchdb-22656c86b3d5f3ad977bb72c4375874403940158.tar.gz | |
fix tests
| -rw-r--r-- | src/couch_peruser/src/couch_peruser.app.src | 2 | ||||
| -rw-r--r-- | src/couch_peruser/test/couch_peruser_test.erl | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/couch_peruser/src/couch_peruser.app.src b/src/couch_peruser/src/couch_peruser.app.src index 42b7b25b2..9859e03da 100644 --- a/src/couch_peruser/src/couch_peruser.app.src +++ b/src/couch_peruser/src/couch_peruser.app.src @@ -14,7 +14,7 @@ {description, "couch_peruser - maintains per-user databases in CouchDB"}, {vsn, git}, {registered, []}, - {applications, [kernel, stdlib, config, couch, fabric, couch_replicator, mem3]}, + {applications, [kernel, stdlib, config, couch, fabric, mem3]}, {mod, {couch_peruser_app, []}}, {env, []}, {modules, [couch_peruser, couch_peruser_app, couch_peruser_sup]} diff --git a/src/couch_peruser/test/couch_peruser_test.erl b/src/couch_peruser/test/couch_peruser_test.erl index f7ef8cdb1..726b2dbee 100644 --- a/src/couch_peruser/test/couch_peruser_test.erl +++ b/src/couch_peruser/test/couch_peruser_test.erl @@ -35,13 +35,22 @@ setup() -> do_request(put, get_base_url() ++ "/" ++ ?b2l(TestAuthDb)), do_request(put, get_cluster_base_url() ++ "/" ++ ?b2l(TestAuthDb)), set_config("couch_httpd_auth", "authentication_db", ?b2l(TestAuthDb)), + set_config("couch_peruser", "cluster_quiet_period", "1"), + set_config("couch_peruser", "cluster_start_period", "1"), set_config("couch_peruser", "enable", "true"), + set_config("cluster", "n", "1"), + set_config("log", "level", "debug"), + timer:sleep(6000), TestAuthDb. teardown(TestAuthDb) -> set_config("couch_peruser", "enable", "false"), set_config("couch_peruser", "delete_dbs", "false"), set_config("couch_httpd_auth", "authentication_db", "_users"), + set_config("couch_peruser", "cluster_quiet_period", "60"), + set_config("couch_peruser", "cluster_start_period", "5"), + set_config("cluster", "n", "3"), + set_config("log", "level", "info"), do_request(delete, get_cluster_base_url() ++ "/" ++ ?b2l(TestAuthDb)), do_request(delete, get_base_url() ++ "/" ++ ?b2l(TestAuthDb)), lists:foreach(fun (DbName) -> @@ -153,8 +162,10 @@ should_delete_user_db(TestAuthDb) -> UserDbName = <<"userdb-626172">>, set_config("couch_peruser", "delete_dbs", "true"), create_user(TestAuthDb, User), + timer:sleep(2000), ?assert(lists:member(UserDbName, all_dbs())), delete_user(TestAuthDb, User), + timer:sleep(2000), ?_assert(not lists:member(UserDbName, all_dbs())). should_reflect_config_changes(TestAuthDb) -> @@ -162,20 +173,26 @@ should_reflect_config_changes(TestAuthDb) -> UserDbName = <<"userdb-62617a">>, set_config("couch_peruser", "delete_dbs", "true"), create_user(TestAuthDb, User), + timer:sleep(2000), ?assert(lists:member(UserDbName, all_dbs())), delete_user(TestAuthDb, User), + timer:sleep(2000), ?assert(not lists:member(UserDbName, all_dbs())), create_user(TestAuthDb, User), + timer:sleep(2000), ?assert(lists:member(UserDbName, all_dbs())), set_config("couch_peruser", "delete_dbs", "false"), delete_user(TestAuthDb, User), + timer:sleep(2000), ?assert(lists:member(UserDbName, all_dbs())), create_user(TestAuthDb, User), set_config("couch_peruser", "delete_dbs", "true"), delete_user(TestAuthDb, User), + timer:sleep(2000), ?assert(not lists:member(UserDbName, all_dbs())), set_config("couch_peruser", "enable", "false"), create_user(TestAuthDb, User), + timer:sleep(2000), ?_assert(not lists:member(UserDbName, all_dbs())). should_add_user_to_db_admins(TestAuthDb) -> |