From 1549a172f7ec1bf3bdfe9b2c9a7265121e7e3d03 Mon Sep 17 00:00:00 2001 From: sohalt Date: Tue, 7 Apr 2020 19:15:31 +0200 Subject: [PATCH] fix typo --- conf/roles.yml | 4 ++-- misc/debug_roles.py | 2 +- tests/cfg/nested.yml | 4 ++-- tests/cfg/roles.yml | 4 ++-- tests/cfg/roles_adldap.yml | 4 ++-- tests/cfg/roles_content_dup.yml | 4 ++-- tests/cfg/roles_key_dup.yml | 4 ++-- tests/cfg/roles_missing_backends.yml | 4 ++-- tests/cfg/roles_missing_diplay_name.yml | 4 ++-- tests/cfg/roles_test.yml | 4 ++-- tests/test_Roles.py | 10 +++++----- tests/test_env/etc/ldap/content.ldif | 4 ++-- tests/test_env/etc/ldapcherry/roles.yml | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/conf/roles.yml b/conf/roles.yml index 61970e5..77358cc 100644 --- a/conf/roles.yml +++ b/conf/roles.yml @@ -25,12 +25,12 @@ admin-lv2: # ad: # - Administrators -developpers: +developers: display_name: Developpers description: Developpers of the system backends_groups: ldap: - - cn=developpers,ou=Group,dc=example,dc=org + - cn=developers,ou=Group,dc=example,dc=org - cn=users,ou=Group,dc=example,dc=org users: diff --git a/misc/debug_roles.py b/misc/debug_roles.py index e20722b..1b6cb4c 100644 --- a/misc/debug_roles.py +++ b/misc/debug_roles.py @@ -30,7 +30,7 @@ groups = { 'ad' : ['Domain Users', 'Domain Users 2'], 'ldap': ['cn=users,ou=group,dc=example,dc=com', 'cn=nagios admins,ou=group,dc=example,dc=com', - 'cn=developpers,ou=group,dc=example,dc=com', + 'cn=developers,ou=group,dc=example,dc=com', ], 'toto': ['not a group'], } diff --git a/tests/cfg/nested.yml b/tests/cfg/nested.yml index 1fdde7a..ddbc935 100644 --- a/tests/cfg/nested.yml +++ b/tests/cfg/nested.yml @@ -21,10 +21,10 @@ users: display_name: Administrators Level 3 description: description subroles: {} - developpers: + developers: backends_groups: ad: [Domain Users] - ldap: ['cn=developpers,ou=group,dc=example,dc=com'] + ldap: ['cn=developers,ou=group,dc=example,dc=com'] display_name: Developpers description: description subroles: {} diff --git a/tests/cfg/roles.yml b/tests/cfg/roles.yml index 72bc47c..43c8559 100644 --- a/tests/cfg/roles.yml +++ b/tests/cfg/roles.yml @@ -23,12 +23,12 @@ admin-lv2: ad: - Domain Users -developpers: +developers: display_name: Developpers description: description backends_groups: ldap: - - cn=developpers,ou=group,dc=example,dc=com + - cn=developers,ou=group,dc=example,dc=com - cn=users,ou=group,dc=example,dc=com ad: - Domain Users diff --git a/tests/cfg/roles_adldap.yml b/tests/cfg/roles_adldap.yml index d7fb453..e7b60dd 100644 --- a/tests/cfg/roles_adldap.yml +++ b/tests/cfg/roles_adldap.yml @@ -23,12 +23,12 @@ admin-lv2: ad: - Administrators -#developpers: +#developers: # display_name: Developpers # description: Developpers of the system # backends_groups: # ldap: -# - cn=developpers,ou=Group,dc=example,dc=org +# - cn=developers,ou=Group,dc=example,dc=org # - cn=users,ou=Group,dc=example,dc=org #users: diff --git a/tests/cfg/roles_content_dup.yml b/tests/cfg/roles_content_dup.yml index 73c422d..d508559 100644 --- a/tests/cfg/roles_content_dup.yml +++ b/tests/cfg/roles_content_dup.yml @@ -23,12 +23,12 @@ admin -lv2: ad: - Domain Users -developpers: +developers: display_name: Developpers description: description backends_groups: ldap: - - cn=developpers,ou=group,dc=example,dc=com + - cn=developers,ou=group,dc=example,dc=com - cn=users,ou=group,dc=example,dc=com ad: - Domain Users diff --git a/tests/cfg/roles_key_dup.yml b/tests/cfg/roles_key_dup.yml index b3aaec1..7f3643c 100644 --- a/tests/cfg/roles_key_dup.yml +++ b/tests/cfg/roles_key_dup.yml @@ -23,12 +23,12 @@ admin -lv3: ad: - Domain Users -developpers: +developers: display_name: Developpers description: description backends_groups: ldap: - - cn=developpers,ou=group,dc=example,dc=com + - cn=developers,ou=group,dc=example,dc=com - cn=users,ou=group,dc=example,dc=com ad: - Domain Users diff --git a/tests/cfg/roles_missing_backends.yml b/tests/cfg/roles_missing_backends.yml index c13f5b0..b903672 100644 --- a/tests/cfg/roles_missing_backends.yml +++ b/tests/cfg/roles_missing_backends.yml @@ -17,12 +17,12 @@ admin-lv2: display_name: Administrators Level 2 description: description -developpers: +developers: display_name: Developpers description: description backends_groups: ldap: - - cn=developpers,ou=group,dc=example,dc=com + - cn=developers,ou=group,dc=example,dc=com - cn=users,ou=group,dc=example,dc=com ad: - Domain Users diff --git a/tests/cfg/roles_missing_diplay_name.yml b/tests/cfg/roles_missing_diplay_name.yml index 435fd7f..9e2042d 100644 --- a/tests/cfg/roles_missing_diplay_name.yml +++ b/tests/cfg/roles_missing_diplay_name.yml @@ -22,12 +22,12 @@ admin-lv2: ad: - Domain Users -developpers: +developers: display_name: Developpers description: description backends_groups: ldap: - - cn=developpers,ou=group,dc=example,dc=com + - cn=developers,ou=group,dc=example,dc=com - cn=users,ou=group,dc=example,dc=com ad: - Domain Users diff --git a/tests/cfg/roles_test.yml b/tests/cfg/roles_test.yml index 948fb83..cb897eb 100644 --- a/tests/cfg/roles_test.yml +++ b/tests/cfg/roles_test.yml @@ -17,12 +17,12 @@ admin-lv2: - cn=nagios admins,ou=Group,dc=example,dc=org - cn=users,ou=Group,dc=example,dc=org -developpers: +developers: display_name: Developpers description: Developpers of the system backends_groups: ldap: - - cn=developpers,ou=Group,dc=example,dc=org + - cn=developers,ou=Group,dc=example,dc=org - cn=users,ou=Group,dc=example,dc=org users: diff --git a/tests/test_Roles.py b/tests/test_Roles.py index 84e9994..702aebf 100644 --- a/tests/test_Roles.py +++ b/tests/test_Roles.py @@ -107,10 +107,10 @@ class TestError(object): 'description': 'description', 'display_name': 'Administrators Level 3' }, - 'developpers': { + 'developers': { 'backends_groups': { 'ad': ['Domain Users'], - 'ldap': ['cn=developpers,ou=group,dc=example,dc=com', + 'ldap': ['cn=developers,ou=group,dc=example,dc=com', 'cn=users,ou=group,dc=example,dc=com']}, 'description': 'description', 'display_name': 'Developpers' @@ -152,7 +152,7 @@ class TestError(object): def testGetAllRoles(self): inv = Roles('./tests/cfg/roles.yml') res = inv.get_allroles() - expected = ['developpers', 'admin-lv3', 'admin-lv2', 'users'] + expected = ['developers', 'admin-lv3', 'admin-lv2', 'users'] assert res == expected def testGetAllRoles(self): @@ -187,9 +187,9 @@ class TestError(object): 'ad' : ['Domain Users', 'Domain Users 2'], 'ldap': ['cn=users,ou=group,dc=example,dc=com', 'cn=nagios admins,ou=group,dc=example,dc=com', - 'cn=developpers,ou=group,dc=example,dc=com', + 'cn=developers,ou=group,dc=example,dc=com', ], 'toto': ['not a group'], } - expected = {'unusedgroups': {'toto': set(['not a group']), 'ad': set(['Domain Users 2'])}, 'roles': set(['developpers', 'admin-lv2', 'users'])} + expected = {'unusedgroups': {'toto': set(['not a group']), 'ad': set(['Domain Users 2'])}, 'roles': set(['developers', 'admin-lv2', 'users'])} assert inv.get_roles(groups) == expected diff --git a/tests/test_env/etc/ldap/content.ldif b/tests/test_env/etc/ldap/content.ldif index acc5f28..0e3f2f7 100644 --- a/tests/test_env/etc/ldap/content.ldif +++ b/tests/test_env/etc/ldap/content.ldif @@ -103,9 +103,9 @@ cn: users description: Basic Users member: cn=Sheri Smith,ou=people,dc=example,dc=org -dn: cn=developpers,ou=group,dc=example,dc=org +dn: cn=developers,ou=group,dc=example,dc=org objectclass: groupofnames -cn: developpers +cn: developers description: Developpers member: cn=Sheri Smith,ou=people,dc=example,dc=org diff --git a/tests/test_env/etc/ldapcherry/roles.yml b/tests/test_env/etc/ldapcherry/roles.yml index 114359e..ca7d12b 100644 --- a/tests/test_env/etc/ldapcherry/roles.yml +++ b/tests/test_env/etc/ldapcherry/roles.yml @@ -20,12 +20,12 @@ admin-lv2: - cn=nagios admins,ou=Group,dc=example,dc=org - cn=users,ou=Group,dc=example,dc=org -developpers: +developers: display_name: Developpers description: description backends_groups: ldap: - - cn=developpers,ou=Group,dc=example,dc=org + - cn=developers,ou=Group,dc=example,dc=org - cn=users,ou=Group,dc=example,dc=org users: