diff options
Diffstat (limited to 'ipatests/test_ipapython')
| -rw-r--r-- | ipatests/test_ipapython/test_dn.py | 15 | ||||
| -rw-r--r-- | ipatests/test_ipapython/test_ipautil.py | 28 |
2 files changed, 17 insertions, 26 deletions
diff --git a/ipatests/test_ipapython/test_dn.py b/ipatests/test_ipapython/test_dn.py index daff365f2..dae7d016e 100644 --- a/ipatests/test_ipapython/test_dn.py +++ b/ipatests/test_ipapython/test_dn.py @@ -1,6 +1,7 @@ #!/usr/bin/python2 import unittest + from ipapython.dn import * def expected_class(klass, component): @@ -248,13 +249,6 @@ class TestAVA(unittest.TestCase): self.assertFalse(ava3_a in d) self.assertFalse(ava3_b in d) - self.assertTrue(d.has_key(ava1_a)) - self.assertTrue(d.has_key(ava1_b)) - self.assertTrue(d.has_key(ava2_a)) - self.assertTrue(d.has_key(ava2_b)) - self.assertFalse(d.has_key(ava3_a)) - self.assertFalse(d.has_key(ava3_b)) - self.assertTrue(ava1_a in s) self.assertTrue(ava1_b in s) self.assertTrue(ava2_a in s) @@ -1135,13 +1129,6 @@ class TestDN(unittest.TestCase): self.assertFalse(dn3_a in d) self.assertFalse(dn3_b in d) - self.assertTrue(d.has_key(dn1_a)) - self.assertTrue(d.has_key(dn1_b)) - self.assertTrue(d.has_key(dn2_a)) - self.assertTrue(d.has_key(dn2_b)) - self.assertFalse(d.has_key(dn3_a)) - self.assertFalse(d.has_key(dn3_b)) - self.assertTrue(dn1_a in s) self.assertTrue(dn1_b in s) self.assertTrue(dn2_a in s) diff --git a/ipatests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py index 8c0c68909..112759b01 100644 --- a/ipatests/test_ipapython/test_ipautil.py +++ b/ipatests/test_ipapython/test_ipautil.py @@ -20,7 +20,10 @@ Test the `ipapython/ipautil.py` module. """ +import sys + import nose +import pytest from ipapython import ipautil @@ -116,13 +119,13 @@ class TestCIDict(object): nose.tools.assert_equal("newval4", self.cidict["key4"]) def test_del(self): - assert self.cidict.has_key("Key1") + assert "Key1" in self.cidict del(self.cidict["Key1"]) - assert not self.cidict.has_key("Key1") + assert "Key1" not in self.cidict - assert self.cidict.has_key("key2") + assert "key2" in self.cidict del(self.cidict["KEY2"]) - assert not self.cidict.has_key("key2") + assert "key2" not in self.cidict def test_clear(self): nose.tools.assert_equal(3, len(self.cidict)) @@ -138,10 +141,11 @@ class TestCIDict(object): copy = self.cidict.copy() assert copy == self.cidict nose.tools.assert_equal(3, len(copy)) - assert copy.has_key("Key1") - assert copy.has_key("key1") + assert "Key1" in copy + assert "key1" in copy nose.tools.assert_equal("val1", copy["Key1"]) + @pytest.mark.skipif(sys.version_info >= (3, 0), reason="Python 2 only") def test_haskey(self): assert self.cidict.has_key("KEY1") assert self.cidict.has_key("key2") @@ -269,22 +273,22 @@ class TestCIDict(object): def test_setdefault(self): nose.tools.assert_equal("val1", self.cidict.setdefault("KEY1", "default")) - assert not self.cidict.has_key("KEY4") + assert "KEY4" not in self.cidict nose.tools.assert_equal("default", self.cidict.setdefault("KEY4", "default")) - assert self.cidict.has_key("KEY4") + assert "KEY4" in self.cidict nose.tools.assert_equal("default", self.cidict["key4"]) - assert not self.cidict.has_key("KEY5") + assert "KEY5" not in self.cidict nose.tools.assert_equal(None, self.cidict.setdefault("KEY5")) - assert self.cidict.has_key("KEY5") + assert "KEY5" in self.cidict nose.tools.assert_equal(None, self.cidict["key5"]) def test_pop(self): nose.tools.assert_equal("val1", self.cidict.pop("KEY1", "default")) - assert not self.cidict.has_key("key1") + assert "key1" not in self.cidict nose.tools.assert_equal("val2", self.cidict.pop("KEY2")) - assert not self.cidict.has_key("key2") + assert "key2" not in self.cidict nose.tools.assert_equal("default", self.cidict.pop("key4", "default")) with nose.tools.assert_raises(KeyError): |