def setUp(self):
cursor = connection._cursor()
for base in [LdapGroup.base_dn, LdapUser.base_dn]:
- ou = base.split(',')[0].split('=')[1]
- attrs = [('objectClass', ['top', 'organizationalUnit']), ('ou', [ou])]
+ rdn = base.split(',')[0]
+ key, val = rdn.split('=')
+ attrs = [('objectClass', ['top', 'organizationalUnit']), (key, [val])]
try:
cursor.connection.add_s(base, attrs)
except ldap.ALREADY_EXISTS:
def tearDown(self):
cursor = connection._cursor()
for base in [LdapGroup.base_dn, LdapUser.base_dn]:
- results = cursor.connection.search_s(base, ldap.SCOPE_SUBTREE)
- for dn, attrs in reversed(results):
- cursor.connection.delete_s(dn)
+ try:
+ results = cursor.connection.search_s(base, ldap.SCOPE_SUBTREE)
+ for dn, attrs in reversed(results):
+ cursor.connection.delete_s(dn)
+ except ldap.NO_SUCH_OBJECT:
+ pass
class GroupTestCase(BaseTestCase):
def setUp(self):
qs = LdapGroup.objects.filter(name='foogroup')
self.assertEquals(len(qs), 1)
+ g = qs[0]
+ self.assertEquals(g.dn, 'cn=foogroup,ou=groups,dc=nodomain')
+ self.assertEquals(g.name, 'foogroup')
+ self.assertEquals(g.gid, 1000)
+ self.assertEquals(g.usernames, ['foouser', 'baruser'])
+
qs = LdapGroup.objects.filter(name='does_not_exist')
self.assertEquals(len(qs), 0)
def test_update(self):
g = LdapGroup.objects.get(name='foogroup')
+
+ g.gid = 1002
+ g.usernames = ['foouser2', 'baruser2']
+ g.save()
+
+ # make sure DN gets updated if we change the pk
g.name = 'foogroup2'
g.save()
-
- # make sure DN gets updated
self.assertEquals(g.dn, 'cn=foogroup2,ou=groups,dc=nodomain')
def test_delete(self):
super(UserTestCase, self).setUp()
u = LdapUser()
- u.first_name = "Foo"
- u.last_name = "User"
- u.full_name = "Foo User"
+ u.first_name = u"Fôo"
+ u.last_name = u"Usér"
+ u.full_name = u"Fôo Usér"
u.group = 1000
u.home_directory = "/home/foouser"
def test_get(self):
u = LdapUser.objects.get(username='foouser')
- self.assertEquals(u.first_name, 'Foo')
- self.assertEquals(u.last_name, 'User')
- self.assertEquals(u.full_name, 'Foo User')
+ self.assertEquals(u.first_name, u'Fôo')
+ self.assertEquals(u.last_name, u'Usér')
+ self.assertEquals(u.full_name, u'Fôo Usér')
self.assertEquals(u.group, 1000)
self.assertEquals(u.home_directory, '/home/foouser')
self.assertRaises(LdapUser.DoesNotExist, LdapUser.objects.get, username='does_not_exist')
+ def test_update(self):
+ u = LdapUser.objects.get(username='foouser')
+ u.first_name = u'Fôo2'
+ u.save()
+
+ # make sure DN gets updated if we change the pk
+ u.username = 'foouser2'
+ u.save()
+ self.assertEquals(u.dn, 'uid=foouser2,ou=people,dc=nodomain')
+
class AdminTestCase(BaseTestCase):
fixtures = ['test_users.json']