X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=examples%2Ftests.py;h=08d85b7b6e06dc7d5d5efbaddbcded2eff476d54;hb=82901736cde9aae9fbe8b6acc0aad2141ecd9583;hp=6d2f8c5b40b083e5c706f9b84d1c5596d352ef34;hpb=de6f78f7a31674ccb7e7f223f3272e4970cdb757;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/examples/tests.py b/examples/tests.py
index 6d2f8c5..08d85b7 100644
--- a/examples/tests.py
+++ b/examples/tests.py
@@ -29,8 +29,9 @@ class BaseTestCase(TestCase):
     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:
@@ -39,9 +40,12 @@ class BaseTestCase(TestCase):
     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):
@@ -69,6 +73,12 @@ class GroupTestCase(BaseTestCase):
         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)
 
@@ -83,10 +93,14 @@ class GroupTestCase(BaseTestCase):
 
     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):
@@ -101,9 +115,9 @@ class UserTestCase(BaseTestCase):
         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"
@@ -114,9 +128,9 @@ class UserTestCase(BaseTestCase):
 
     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')
@@ -126,6 +140,16 @@ class UserTestCase(BaseTestCase):
 
         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']
 
@@ -138,6 +162,12 @@ class AdminTestCase(BaseTestCase):
         g.usernames = ['foouser', 'baruser']
         g.save()
 
+        g = LdapGroup()
+        g.name = "bargroup"
+        g.gid = 1001
+        g.usernames = ['zoouser', 'baruser']
+        g.save()
+
         u = LdapUser()
         u.first_name = "Foo"
         u.last_name = "User"
@@ -165,6 +195,10 @@ class AdminTestCase(BaseTestCase):
         self.assertContains(response, "foogroup")
         self.assertContains(response, "1000")
 
+    def test_group_search(self):
+        response = self.client.get('/admin/examples/ldapgroup/?q=foo')
+        self.assertContains(response, "foogroup")
+
     def test_user_list(self):
         response = self.client.get('/admin/examples/ldapuser/')
         self.assertContains(response, "Ldap users")