diff options
author | Petr Viktorin <pviktori@redhat.com> | 2014-10-07 12:48:22 +0200 |
---|---|---|
committer | Tomas Babej <tbabej@redhat.com> | 2014-11-21 12:14:44 +0100 |
commit | 375e9f7c4b855ee8abbab6b5574d54bbd9fb1742 (patch) | |
tree | 88cf59d1736cc9fb3bf23c6a8c63f4c498ebf06a /ipatests/test_ipaserver/test_ldap.py | |
parent | 7de424f42541e73ed24a95f1dd90ff4a61e111fa (diff) | |
download | freeipa-375e9f7c4b855ee8abbab6b5574d54bbd9fb1742.tar.gz freeipa-375e9f7c4b855ee8abbab6b5574d54bbd9fb1742.tar.xz freeipa-375e9f7c4b855ee8abbab6b5574d54bbd9fb1742.zip |
tests: Use PEP8-compliant setup/teardown method names
The setUp/dearDown names are used in the unittest module, but there is no reason
to use them in non-`unittest` test cases.
Nose supports both styles (but mixing them can cause trouble when
calling super()'s methods).
Pytest only supports the new ones.
https://fedorahosted.org/freeipa/ticket/4610
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_ipaserver/test_ldap.py')
-rw-r--r-- | ipatests/test_ipaserver/test_ldap.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipatests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py index 46182dbea..8b4e50058 100644 --- a/ipatests/test_ipaserver/test_ldap.py +++ b/ipatests/test_ipaserver/test_ldap.py @@ -44,7 +44,7 @@ class test_ldap(object): Test various LDAP client bind methods. """ - def setUp(self): + def setup(self): self.conn = None self.ldapuri = 'ldap://%s' % ipautil.format_netloc(api.env.host) self.ccache = paths.TMP_KRB5CC % os.getuid() @@ -52,7 +52,7 @@ class test_ldap(object): self.dn = DN(('krbprincipalname','ldap/%s@%s' % (api.env.host, api.env.realm)), ('cn','services'),('cn','accounts'),api.env.basedn) - def tearDown(self): + def teardown(self): if self.conn and self.conn.isconnected(): self.conn.disconnect() @@ -158,14 +158,14 @@ class test_LDAPEntry(object): dn1 = DN(('cn', cn1[0])) dn2 = DN(('cn', cn2[0])) - def setUp(self): + def setup(self): self.ldapuri = 'ldap://%s' % ipautil.format_netloc(api.env.host) self.conn = ldap2(shared_instance=False, ldap_uri=self.ldapuri) self.conn.connect() self.entry = self.conn.make_entry(self.dn1, cn=self.cn1) - def tearDown(self): + def teardown(self): if self.conn and self.conn.isconnected(): self.conn.disconnect() |