X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=examples%2Ftests.py;h=af8867c19fb2f0df15d1c0a4319cca0674bc5b46;hp=d41d576b81b5c9a72af82ccfe3cdb3d33372dbd4;hb=75d4446eb587e435537cc09499a1987a9e35b0f6;hpb=607a29c44721a799b562de30c50846d633a32933 diff --git a/examples/tests.py b/examples/tests.py index d41d576..af8867c 100644 --- a/examples/tests.py +++ b/examples/tests.py @@ -79,7 +79,7 @@ class GroupTestCase(BaseTestCase): self.assertEquals(len(qs), 1) g = qs[0] - self.assertEquals(g.dn, 'cn=foogroup,ou=groups,dc=nodomain') + self.assertEquals(g.dn, 'cn=foogroup,%s' % LdapGroup.base_dn) self.assertEquals(g.name, 'foogroup') self.assertEquals(g.gid, 1000) self.assertEquals(g.usernames, ['foouser', 'baruser']) @@ -90,7 +90,7 @@ class GroupTestCase(BaseTestCase): def test_get(self): g = LdapGroup.objects.get(name='foogroup') - self.assertEquals(g.dn, 'cn=foogroup,ou=groups,dc=nodomain') + self.assertEquals(g.dn, 'cn=foogroup,%s' % LdapGroup.base_dn) self.assertEquals(g.name, 'foogroup') self.assertEquals(g.gid, 1000) self.assertEquals(g.usernames, ['foouser', 'baruser']) @@ -143,13 +143,9 @@ class GroupTestCase(BaseTestCase): qs = LdapGroup.objects.all() objs = qs[:2] - for o in objs: - return - print objs self.assertEquals(len(objs), 2) self.assertEquals(objs[0].gid, 1000) self.assertEquals(objs[1].gid, 1001) - return qs = LdapGroup.objects.all() objs = qs[1:] @@ -167,7 +163,7 @@ class GroupTestCase(BaseTestCase): # make sure DN gets updated if we change the pk g.name = 'foogroup2' g.save() - self.assertEquals(g.dn, 'cn=foogroup2,ou=groups,dc=nodomain') + self.assertEquals(g.dn, 'cn=foogroup2,%s' % LdapGroup.base_dn) def test_values(self): qs = LdapGroup.objects.values('name') @@ -228,7 +224,7 @@ class UserTestCase(BaseTestCase): # 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') + self.assertEquals(u.dn, 'uid=foouser2,%s' % LdapUser.base_dn) class AdminTestCase(BaseTestCase): fixtures = ['test_users.json']