diff options
author | Petr Viktorin <pviktori@redhat.com> | 2015-07-30 17:29:39 +0200 |
---|---|---|
committer | Tomas Babej <tbabej@redhat.com> | 2015-08-12 18:17:23 +0200 |
commit | 6a741b51dac6efd650f2427604bd54cbf300f761 (patch) | |
tree | 2a1ebde55d64a6e2f3c33d1cc8c1ce64f73570f7 /ipatests/test_ipaserver/test_ldap.py | |
parent | 8b88caa110e83b42b1e43189c06b6cb3de712353 (diff) | |
download | freeipa-6a741b51dac6efd650f2427604bd54cbf300f761.tar.gz freeipa-6a741b51dac6efd650f2427604bd54cbf300f761.tar.xz freeipa-6a741b51dac6efd650f2427604bd54cbf300f761.zip |
Replace dict.has_key with the 'in' operator
The deprecated has_key method will be removed from dicts in Python 3.
For custom dict-like classes, has_key() is kept on Python 2,
but disabled for Python 3.
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 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ipatests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py index 05ae87c1c..28e84fb70 100644 --- a/ipatests/test_ipaserver/test_ldap.py +++ b/ipatests/test_ipaserver/test_ldap.py @@ -26,7 +26,9 @@ # The DM password needs to be set in ~/.ipa/.dmpw import os +import sys +import pytest import nose from nose.tools import assert_raises # pylint: disable=E0611 import nss.nss as nss @@ -238,12 +240,19 @@ class test_LDAPEntry(object): assert not e assert 'cn' not in e + @pytest.mark.skipif(sys.version_info >= (3, 0), reason="Python 2 only") def test_has_key(self): e = self.entry assert not e.has_key('xyz') assert e.has_key('cn') assert e.has_key('COMMONNAME') + def test_in(self): + e = self.entry + assert 'xyz' not in e + assert 'cn' in e + assert 'COMMONNAME' in e + def test_get(self): e = self.entry assert e.get('cn') == self.cn1 |