Merge pull request #710 from apache/fix/peruser-test

Fix/peruser test

1 files changed, 44 insertions, 41 deletions

diff --git a/src/couch_peruser/test/couch_peruser_test.erl b/src/couch_peruser/test/couch_peruser_test.erl
index 41a295a40..c6fde034e 100644
--- a/src/couch_peruser/test/couch_peruser_test.erl
+++ b/src/couch_peruser/test/couch_peruser_test.erl
@@ -136,12 +136,11 @@ should_create_user_db(TestAuthDb) ->
 
 should_create_anon_user_db(TestAuthDb) ->
     create_anon_user(TestAuthDb, "fooo"),
-    io:fwrite("HELLO: " ++ ?b2l(TestAuthDb) ++ "~n", []),
     ?_assert(lists:member(<<"userdb-666f6f6f">>, all_dbs())).
 
 should_not_delete_user_db(TestAuthDb) ->
-    User = "foooo",
-    UserDbName = <<"userdb-666f6f6f6f">>,
+    User = "foo",
+    UserDbName = <<"userdb-666f6f">>,
     create_user(TestAuthDb, User),
     ?assert(lists:member(UserDbName, all_dbs())),
     delete_user(TestAuthDb, User),
@@ -164,22 +163,18 @@ should_reflect_config_changes(TestAuthDb) ->
     ?assert(lists:member(UserDbName, all_dbs())),
     delete_user(TestAuthDb, User),
     ?assert(not lists:member(UserDbName, all_dbs())),
-    User2 = "bazz",
-    UserDbName2 = <<"userdb-62617a7a">>,
-    create_user(TestAuthDb, User2),
-    ?assert(lists:member(UserDbName2, all_dbs())),
+    create_user(TestAuthDb, User),
+    ?assert(lists:member(UserDbName, all_dbs())),
     set_config("couch_peruser", "delete_dbs", "false"),
-    delete_user(TestAuthDb, User2),
-    ?assert(lists:member(UserDbName2, all_dbs())),
-    create_user(TestAuthDb, User2),
+    delete_user(TestAuthDb, User),
+    ?assert(lists:member(UserDbName, all_dbs())),
+    create_user(TestAuthDb, User),
     set_config("couch_peruser", "delete_dbs", "true"),
-    delete_user(TestAuthDb, User2),
-    ?assert(not lists:member(UserDbName2, all_dbs())),
+    delete_user(TestAuthDb, User),
+    ?assert(not lists:member(UserDbName, all_dbs())),
     set_config("couch_peruser", "enable", "false"),
-    User3 = "bazzz",
-    UserDbName3 = <<"userdb-62617a7a7a">>,
-    create_user(TestAuthDb, User3),
-    ?_assert(not lists:member(UserDbName3, all_dbs())).
+    create_user(TestAuthDb, User),
+    ?_assert(not lists:member(UserDbName, all_dbs())).
 
 should_add_user_to_db_admins(TestAuthDb) ->
     User = "qux",
@@ -190,16 +185,16 @@ should_add_user_to_db_admins(TestAuthDb) ->
         proplists:get_value(<<"admins">>, get_security(UserDbName))).
 
 should_add_user_to_db_members(TestAuthDb) ->
-    User = "quxx",
-    UserDbName = <<"userdb-71757878">>,
+    User = "qux",
+    UserDbName = <<"userdb-717578">>,
     create_user(TestAuthDb, User),
     ?_assertEqual(
-        {[{<<"names">>,[<<"quxx">>]}]},
+        {[{<<"names">>,[<<"qux">>]}]},
         proplists:get_value(<<"members">>, get_security(UserDbName))).
 
 should_not_remove_existing_db_admins(TestAuthDb) ->
-    User = "quxxx",
-    UserDbName = <<"userdb-7175787878">>,
+    User = "qux",
+    UserDbName = <<"userdb-717578">>,
     SecurityProperties = [
         {<<"admins">>,{[{<<"names">>,[<<"foo">>,<<"bar">>]}]}},
         {<<"members">>,{[{<<"names">>,[<<"baz">>,<<"pow">>]}]}}
@@ -210,13 +205,15 @@ should_not_remove_existing_db_admins(TestAuthDb) ->
     {AdminProperties} = proplists:get_value(<<"admins">>,
         get_security(UserDbName)),
     AdminNames = proplists:get_value(<<"names">>, AdminProperties),
-    ?_assert(lists:member(<<"foo">>, AdminNames)),
-    ?_assert(lists:member(<<"bar">>, AdminNames)),
-    ?_assert(lists:member(<<"quxxx">>, AdminNames)).
+    [
+      ?_assert(lists:member(<<"foo">>, AdminNames)),
+      ?_assert(lists:member(<<"bar">>, AdminNames)),
+      ?_assert(lists:member(<<"qux">>, AdminNames))
+    ].
 
 should_not_remove_existing_db_members(TestAuthDb) ->
-    User = "quy",
-    UserDbName = <<"userdb-717579">>,
+    User = "qux",
+    UserDbName = <<"userdb-717578">>,
     SecurityProperties = [
         {<<"admins">>,{[{<<"names">>,[<<"pow">>,<<"wow">>]}]}},
         {<<"members">>,{[{<<"names">>,[<<"pow">>,<<"wow">>]}]}}
@@ -227,13 +224,15 @@ should_not_remove_existing_db_members(TestAuthDb) ->
     {MemberProperties} = proplists:get_value(<<"members">>,
         get_security(UserDbName)),
     MemberNames = proplists:get_value(<<"names">>, MemberProperties),
-    ?_assert(lists:member(<<"pow">>, MemberNames)),
-    ?_assert(lists:member(<<"wow">>, MemberNames)),
-    ?_assert(lists:member(<<"quy">>, MemberNames)).
+    [
+      ?_assert(lists:member(<<"pow">>, MemberNames)),
+      ?_assert(lists:member(<<"wow">>, MemberNames)),
+      ?_assert(lists:member(<<"qux">>, MemberNames))
+    ].
 
 should_remove_user_from_db_admins(TestAuthDb) ->
-    User = "quz",
-    UserDbName = <<"userdb-71757a">>,
+    User = "qux",
+    UserDbName = <<"userdb-717578">>,
     SecurityProperties = [
         {<<"admins">>,{[{<<"names">>,[<<"foo">>,<<"bar">>]}]}},
         {<<"members">>,{[{<<"names">>,[<<"baz">>,<<"pow">>]}]}}
@@ -246,18 +245,20 @@ should_remove_user_from_db_admins(TestAuthDb) ->
     AdminNames = proplists:get_value(<<"names">>, AdminProperties),
     ?assert(lists:member(<<"foo">>, AdminNames)),
     ?assert(lists:member(<<"bar">>, AdminNames)),
-    ?assert(lists:member(<<"quz">>, AdminNames)),
+    ?assert(lists:member(<<"qux">>, AdminNames)),
     delete_user(TestAuthDb, User),
     {NewAdminProperties} = proplists:get_value(<<"admins">>,
         get_security(UserDbName)),
     NewAdminNames = proplists:get_value(<<"names">>, NewAdminProperties),
-    ?_assert(lists:member(<<"foo">>, NewAdminNames)),
-    ?_assert(lists:member(<<"bar">>, NewAdminNames)),
-    ?_assert(not lists:member(<<"quz">>, NewAdminNames)).
+    [
+      ?_assert(lists:member(<<"foo">>, NewAdminNames)),
+      ?_assert(lists:member(<<"bar">>, NewAdminNames)),
+      ?_assert(not lists:member(<<"qux">>, NewAdminNames))
+    ].
 
 should_remove_user_from_db_members(TestAuthDb) ->
-    User = "rux",
-    UserDbName = <<"userdb-727578">>,
+    User = "qux",
+    UserDbName = <<"userdb-717578">>,
     SecurityProperties = [
         {<<"admins">>,{[{<<"names">>,[<<"pow">>,<<"wow">>]}]}},
         {<<"members">>,{[{<<"names">>,[<<"pow">>,<<"wow">>]}]}}
@@ -270,14 +271,16 @@ should_remove_user_from_db_members(TestAuthDb) ->
     MemberNames = proplists:get_value(<<"names">>, MemberProperties),
     ?assert(lists:member(<<"pow">>, MemberNames)),
     ?assert(lists:member(<<"wow">>, MemberNames)),
-    ?assert(lists:member(<<"rux">>, MemberNames)),
+    ?assert(lists:member(<<"qux">>, MemberNames)),
     delete_user(TestAuthDb, User),
     {NewMemberProperties} = proplists:get_value(<<"members">>,
         get_security(UserDbName)),
     NewMemberNames = proplists:get_value(<<"names">>, NewMemberProperties),
-    ?_assert(lists:member(<<"foo">>, NewMemberNames)),
-    ?_assert(lists:member(<<"bar">>, NewMemberNames)),
-    ?_assert(not lists:member(<<"rux">>, NewMemberNames)).
+    [
+      ?_assert(lists:member(<<"pow">>, NewMemberNames)),
+      ?_assert(lists:member(<<"wow">>, NewMemberNames)),
+      ?_assert(not lists:member(<<"qux">>, NewMemberNames))
+    ].
 
 couch_peruser_test_() ->
     {