diff options
author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2015-10-09 15:33:16 +0300 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-10-22 18:34:35 +0200 |
commit | efdcf49660505e13607b99ba82eb504cf37b8794 (patch) | |
tree | 64b62f9b68e3e79ef011268e2ecfe82951343baf /src/tests/intg/ent_test.py | |
parent | 86ffb3db2a6e798aaa920a0b40e0c517db8c293f (diff) | |
download | sssd-efdcf49660505e13607b99ba82eb504cf37b8794.tar.gz sssd-efdcf49660505e13607b99ba82eb504cf37b8794.tar.xz sssd-efdcf49660505e13607b99ba82eb504cf37b8794.zip |
intg: Fix all PEP8 issues
Reviewed-by: Michal Židek <mzidek@redhat.com>
Diffstat (limited to 'src/tests/intg/ent_test.py')
-rw-r--r-- | src/tests/intg/ent_test.py | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/tests/intg/ent_test.py b/src/tests/intg/ent_test.py index 7c044c7c7..abba94a24 100644 --- a/src/tests/intg/ent_test.py +++ b/src/tests/intg/ent_test.py @@ -52,47 +52,47 @@ def group_path(request): return backup_envvar_file(name) -USER1 = dict(name="user1", passwd="x", uid=1001, gid=2001, - gecos="User 1", dir="/home/user1", shell="/bin/bash") -USER2 = dict(name="user2", passwd="x", uid=1002, gid=2002, - gecos="User 2", dir="/home/user2", shell="/bin/bash") -USER_LIST = [USER1, USER2] -USER_NAME_DICT = dict((u["name"], u) for u in USER_LIST) -USER_UID_DICT = dict((u["uid"], u) for u in USER_LIST) - - -EMPTY_GROUP = dict(name="empty_group", passwd="x", gid=2000, - mem=ent.contains_only()) -GROUP1 = dict(name="group1", passwd="x", gid=2001, - mem=ent.contains_only()) -GROUP2 = dict(name="group2", passwd="x", gid=2002, - mem=ent.contains_only()) +USER1 = dict(name="user1", passwd="x", uid=1001, gid=2001, + gecos="User 1", dir="/home/user1", shell="/bin/bash") +USER2 = dict(name="user2", passwd="x", uid=1002, gid=2002, + gecos="User 2", dir="/home/user2", shell="/bin/bash") +USER_LIST = [USER1, USER2] +USER_NAME_DICT = dict((u["name"], u) for u in USER_LIST) +USER_UID_DICT = dict((u["uid"], u) for u in USER_LIST) + + +EMPTY_GROUP = dict(name="empty_group", passwd="x", gid=2000, + mem=ent.contains_only()) +GROUP1 = dict(name="group1", passwd="x", gid=2001, + mem=ent.contains_only()) +GROUP2 = dict(name="group2", passwd="x", gid=2002, + mem=ent.contains_only()) ONE_USER_GROUP1 = dict(name="one_user_group1", passwd="x", gid=2011, mem=ent.contains_only("user1")) ONE_USER_GROUP2 = dict(name="one_user_group2", passwd="x", gid=2012, mem=ent.contains_only("user2")) -TWO_USER_GROUP = dict(name="two_user_group", passwd="x", gid=2020, - mem=ent.contains_only("user1", "user2")) -GROUP_LIST = [EMPTY_GROUP, - GROUP1, - GROUP2, - ONE_USER_GROUP1, - ONE_USER_GROUP2, - TWO_USER_GROUP] +TWO_USER_GROUP = dict(name="two_user_group", passwd="x", gid=2020, + mem=ent.contains_only("user1", "user2")) +GROUP_LIST = [EMPTY_GROUP, + GROUP1, + GROUP2, + ONE_USER_GROUP1, + ONE_USER_GROUP2, + TWO_USER_GROUP] GROUP_NAME_DICT = dict((g["name"], g) for g in GROUP_LIST) -GROUP_GID_DICT = dict((g["gid"], g) for g in GROUP_LIST) +GROUP_GID_DICT = dict((g["gid"], g) for g in GROUP_LIST) @pytest.fixture(scope="module") def users_and_groups(request, passwd_path, group_path): passwd_contents = "".join([ - "{name}:{passwd}:{uid}:{gid}:{gecos}:{dir}:{shell}\n".format(**u) \ - for u in USER_LIST + "{name}:{passwd}:{uid}:{gid}:{gecos}:{dir}:{shell}\n".format(**u) + for u in USER_LIST ]) group_contents = "".join([ "%s:%s:%s:%s\n" % (g["name"], g["passwd"], g["gid"], - ",".join(g["mem"])) \ - for g in GROUP_LIST + ",".join(g["mem"])) + for g in GROUP_LIST ]) with open(passwd_path, "a") as f: @@ -174,15 +174,15 @@ def test_assert_each_passwd_by_name(users_and_groups): def test_assert_each_passwd_by_uid(users_and_groups): ent.assert_each_passwd_by_uid({}) - ent.assert_each_passwd_by_uid({1001:USER1}) + ent.assert_each_passwd_by_uid({1001: USER1}) ent.assert_each_passwd_by_uid(USER_UID_DICT) try: - ent.assert_each_passwd_by_uid({1003:{}}) + ent.assert_each_passwd_by_uid({1003: {}}) assert False except AssertionError as e: assert str(e) == "'getpwuid(): uid not found: 1003'" try: - ent.assert_each_passwd_by_uid({1001:dict(uid=1002)}) + ent.assert_each_passwd_by_uid({1001: dict(uid=1002)}) assert False except AssertionError as e: assert str(e) == \ @@ -369,15 +369,15 @@ def test_assert_each_group_by_name(users_and_groups): def test_assert_each_group_by_gid(users_and_groups): ent.assert_each_group_by_gid({}) - ent.assert_each_group_by_gid({2001:GROUP1}) + ent.assert_each_group_by_gid({2001: GROUP1}) ent.assert_each_group_by_gid(GROUP_GID_DICT) try: - ent.assert_each_group_by_gid({2003:{}}) + ent.assert_each_group_by_gid({2003: {}}) assert False except AssertionError as e: assert str(e) == "'getgrgid(): gid not found: 2003'" try: - ent.assert_each_group_by_gid({2001:dict(gid=2002)}) + ent.assert_each_group_by_gid({2001: dict(gid=2002)}) assert False except AssertionError as e: assert str(e) == \ |