Merge pull request #62 from Sohalt/master

fix typo

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:

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'],
 }

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: {}

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

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:

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

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

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

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

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:

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

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
 

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: