From 657ea2b47c958c98f3f591c1bcbe931f514a351d Mon Sep 17 00:00:00 2001 From: stroeder Date: Sat, 18 Nov 2017 22:34:22 +0000 Subject: [PATCH] (re)numbered test classes and methods --- Tests/t_ldapobject.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Tests/t_ldapobject.py b/Tests/t_ldapobject.py index dc3221e..9defe7c 100644 --- a/Tests/t_ldapobject.py +++ b/Tests/t_ldapobject.py @@ -57,7 +57,7 @@ """ -class Test01_SimpleLDAPObject(SlapdTestCase): +class Test00_SimpleLDAPObject(SlapdTestCase): """ test LDAP search operations """ @@ -66,7 +66,7 @@ class Test01_SimpleLDAPObject(SlapdTestCase): @classmethod def setUpClass(cls): - super(Test01_SimpleLDAPObject, cls).setUpClass() + super(Test00_SimpleLDAPObject, cls).setUpClass() # insert some Foo* objects via ldapadd cls.server.ldapadd( LDIF_TEMPLATE % { @@ -85,7 +85,7 @@ def setUp(self): # open local LDAP connection self._ldap_conn = self._open_ldap_conn() - def test_search_subtree(self): + def test001_search_subtree(self): result = self._ldap_conn.search_s( self.server.suffix, ldap.SCOPE_SUBTREE, @@ -115,7 +115,7 @@ def test_search_subtree(self): ] ) - def test_search_onelevel(self): + def test002_search_onelevel(self): result = self._ldap_conn.search_s( self.server.suffix, ldap.SCOPE_ONELEVEL, @@ -141,7 +141,7 @@ def test_search_onelevel(self): ] ) - def test_search_oneattr(self): + def test003_search_oneattr(self): result = self._ldap_conn.search_s( self.server.suffix, ldap.SCOPE_SUBTREE, @@ -154,7 +154,7 @@ def test_search_oneattr(self): [('cn=Foo4,ou=Container,'+self.server.suffix, {'cn': ['Foo4']})] ) - def test_errno107(self): + def test004_errno107(self): l = self.ldap_object_class('ldap://127.0.0.1:42') try: m = l.simple_bind_s("", "") @@ -169,7 +169,7 @@ def test_errno107(self): else: self.fail("expected SERVER_DOWN, got %r" % r) - def test_invalid_credentials(self): + def test005_invalid_credentials(self): l = self.ldap_object_class(self.server.ldap_uri) # search with invalid filter try: @@ -180,7 +180,7 @@ def test_invalid_credentials(self): else: self.fail("expected INVALID_CREDENTIALS, got %r" % r) - def test_sasl_extenal_bind_s(self): + def test006_sasl_extenal_bind_s(self): l = self.ldap_object_class(self.server.ldapi_uri) l.sasl_external_bind_s() self.assertEqual(l.whoami_s(), 'dn:'+self.server.root_dn.lower()) @@ -190,14 +190,14 @@ def test_sasl_extenal_bind_s(self): self.assertEqual(l.whoami_s(), authz_id.lower()) -class Test02_ReconnectLDAPObject(Test01_SimpleLDAPObject): +class Test01_ReconnectLDAPObject(Test00_SimpleLDAPObject): """ test ReconnectLDAPObject by restarting slapd """ ldap_object_class = ReconnectLDAPObject - def test_reconnect_sasl_external(self): + def test101_reconnect_sasl_external(self): l = self.ldap_object_class(self.server.ldapi_uri) l.sasl_external_bind_s() authz_id = l.whoami_s() @@ -205,7 +205,7 @@ def test_reconnect_sasl_external(self): self.server.restart() self.assertEqual(l.whoami_s(), authz_id) - def test_reconnect_simple_bind(self): + def test102_reconnect_simple_bind(self): l = self.ldap_object_class(self.server.ldapi_uri) bind_dn = 'cn=user1,'+self.server.suffix l.simple_bind_s(bind_dn, 'user1_pw') @@ -213,7 +213,7 @@ def test_reconnect_simple_bind(self): self.server.restart() self.assertEqual(l.whoami_s(), 'dn:'+bind_dn) - def test_reconnect_get_state(self): + def test103_reconnect_get_state(self): l1 = self.ldap_object_class(self.server.ldapi_uri) bind_dn = 'cn=user1,'+self.server.suffix l1.simple_bind_s(bind_dn, 'user1_pw')