summaryrefslogtreecommitdiffstats
path: root/ipatests
diff options
context:
space:
mode:
Diffstat (limited to 'ipatests')
-rw-r--r--ipatests/test_ipalib/test_backend.py14
-rw-r--r--ipatests/test_ipalib/test_config.py2
-rw-r--r--ipatests/test_ipalib/test_errors.py8
-rw-r--r--ipatests/test_ipalib/test_frontend.py2
-rw-r--r--ipatests/test_ipalib/test_parameters.py4
-rw-r--r--ipatests/test_ipapython/test_dn.py4
-rw-r--r--ipatests/test_ipapython/test_ipautil.py29
-rw-r--r--ipatests/test_ipaserver/test_ldap.py2
-rw-r--r--ipatests/test_webui/ui_driver.py2
-rw-r--r--ipatests/test_xmlrpc/ldaptracker.py2
-rw-r--r--ipatests/test_xmlrpc/test_pwpolicy_plugin.py3
-rw-r--r--ipatests/util.py4
12 files changed, 40 insertions, 36 deletions
diff --git a/ipatests/test_ipalib/test_backend.py b/ipatests/test_ipalib/test_backend.py
index 163c4f272..756d434e3 100644
--- a/ipatests/test_ipalib/test_backend.py
+++ b/ipatests/test_ipalib/test_backend.py
@@ -223,12 +223,12 @@ class test_Executioner(ClassChecker):
# Test that CommandError is raised:
conn = Connection('The connection.', Disconnect('someconn'))
context.someconn = conn
- print str(context.__dict__.keys())
+ print str(list(context.__dict__))
e = raises(errors.CommandError, o.execute, 'nope')
assert e.name == 'nope'
assert conn.disconnect.called is True # Make sure destroy_context() was called
- print str(context.__dict__.keys())
- assert context.__dict__.keys() == []
+ print str(list(context.__dict__))
+ assert list(context.__dict__) == []
# Test with echo command:
arg1 = unicode_str
@@ -247,7 +247,7 @@ class test_Executioner(ClassChecker):
result=(arg1, arg2, options)
)
assert conn.disconnect.called is True # Make sure destroy_context() was called
- assert context.__dict__.keys() == []
+ assert list(context.__dict__) == []
conn = Connection('The connection.', Disconnect('someconn'))
context.someconn = conn
@@ -255,7 +255,7 @@ class test_Executioner(ClassChecker):
result=(arg1, arg2, options)
)
assert conn.disconnect.called is True # Make sure destroy_context() was called
- assert context.__dict__.keys() == []
+ assert list(context.__dict__) == []
# Test with good command:
conn = Connection('The connection.', Disconnect('someconn'))
@@ -264,14 +264,14 @@ class test_Executioner(ClassChecker):
assert e.name == 'nurse'
assert e.error == u'Not naughty!'
assert conn.disconnect.called is True # Make sure destroy_context() was called
- assert context.__dict__.keys() == []
+ assert list(context.__dict__) == []
# Test with bad command:
conn = Connection('The connection.', Disconnect('someconn'))
context.someconn = conn
e = raises(errors.InternalError, o.execute, 'bad')
assert conn.disconnect.called is True # Make sure destroy_context() was called
- assert context.__dict__.keys() == []
+ assert list(context.__dict__) == []
# Test with option 'name':
conn = Connection('The connection.', Disconnect('someconn'))
diff --git a/ipatests/test_ipalib/test_config.py b/ipatests/test_ipalib/test_config.py
index b4d71e558..f414d55e4 100644
--- a/ipatests/test_ipalib/test_config.py
+++ b/ipatests/test_ipalib/test_config.py
@@ -345,7 +345,7 @@ class test_Env(ClassChecker):
expected.update(dict(group1))
assert list(o) == sorted(expected)
assert expected['key2'] == 'value 2' # And not 'Value 2'
- for (key, value) in expected.iteritems():
+ for (key, value) in expected.items():
assert getattr(o, key) is value
assert o[key] is value
assert o._merge(**expected) == (0, 6)
diff --git a/ipatests/test_ipalib/test_errors.py b/ipatests/test_ipalib/test_errors.py
index 203935113..938b9fcec 100644
--- a/ipatests/test_ipalib/test_errors.py
+++ b/ipatests/test_ipalib/test_errors.py
@@ -47,14 +47,14 @@ class PrivateExceptionTester(object):
klass = property(__get_klass)
def new(self, **kw):
- for (key, value) in kw.iteritems():
+ for (key, value) in kw.items():
assert not hasattr(self.klass, key), key
inst = self.klass(**kw)
assert isinstance(inst, StandardError)
assert isinstance(inst, errors.PrivateError)
assert isinstance(inst, self.klass)
assert not isinstance(inst, errors.PublicError)
- for (key, value) in kw.iteritems():
+ for (key, value) in kw.items():
assert getattr(inst, key) is value
assert str(inst) == self.klass.format % kw
assert inst.message == str(inst)
@@ -212,14 +212,14 @@ class PublicExceptionTester(object):
assert str(e) == TYPE_ERROR % ('message', unicode, 'The message', str)
# Test the instance:
- for (key, value) in kw.iteritems():
+ for (key, value) in kw.items():
assert not hasattr(self.klass, key), key
inst = self.klass(format=format, message=message, **kw)
for required_class in self.required_classes:
assert isinstance(inst, required_class)
assert isinstance(inst, self.klass)
assert not isinstance(inst, errors.PrivateError)
- for (key, value) in kw.iteritems():
+ for (key, value) in kw.items():
assert getattr(inst, key) is value
return inst
diff --git a/ipatests/test_ipalib/test_frontend.py b/ipatests/test_ipalib/test_frontend.py
index 76f500fe2..3798c4ed8 100644
--- a/ipatests/test_ipalib/test_frontend.py
+++ b/ipatests/test_ipalib/test_frontend.py
@@ -430,7 +430,7 @@ class test_Command(ClassChecker):
)
o = self.subcls(api)
o.finalize()
- for (key, value) in o.convert(**kw).iteritems():
+ for (key, value) in o.convert(**kw).items():
assert_equal(unicode(kw[key]), value)
def test_normalize(self):
diff --git a/ipatests/test_ipalib/test_parameters.py b/ipatests/test_ipalib/test_parameters.py
index b466a4f22..a1273448e 100644
--- a/ipatests/test_ipalib/test_parameters.py
+++ b/ipatests/test_ipalib/test_parameters.py
@@ -699,7 +699,7 @@ class test_Data(ClassChecker):
]
for kw in permutations:
o = self.cls('my_data', **kw)
- for (key, value) in kw.iteritems():
+ for (key, value) in kw.items():
assert getattr(o, key) == value
e = raises(ValueError, self.cls, 'my_data', length=5, **kw)
assert str(e) == \
@@ -760,7 +760,7 @@ class test_Bytes(ClassChecker):
assert len(o.class_rules) == len(kw)
assert len(o.rules) == 0
assert len(o.all_rules) == len(kw)
- for (key, value) in kw.iteritems():
+ for (key, value) in kw.items():
assert getattr(o, key) == value
e = raises(ValueError, self.cls, 'my_bytes', length=5, **kw)
assert str(e) == \
diff --git a/ipatests/test_ipapython/test_dn.py b/ipatests/test_ipapython/test_dn.py
index dae7d016e..69ccbde8e 100644
--- a/ipatests/test_ipapython/test_dn.py
+++ b/ipatests/test_ipapython/test_dn.py
@@ -239,7 +239,7 @@ class TestAVA(unittest.TestCase):
self.assertEqual(len(d), 2)
self.assertEqual(len(s), 2)
- self.assertEqual(sorted(d.keys()), sorted([ava1_a, ava2_a]))
+ self.assertEqual(sorted(d), sorted([ava1_a, ava2_a]))
self.assertEqual(sorted(s), sorted([ava1_a, ava2_a]))
self.assertTrue(ava1_a in d)
@@ -1119,7 +1119,7 @@ class TestDN(unittest.TestCase):
self.assertEqual(len(d), 2)
self.assertEqual(len(s), 2)
- self.assertEqual(sorted(d.keys()), sorted([dn1_a, dn2_a]))
+ self.assertEqual(sorted(d), sorted([dn1_a, dn2_a]))
self.assertEqual(sorted(s), sorted([dn1_a, dn2_a]))
self.assertTrue(dn1_a in d)
diff --git a/ipatests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py
index 112759b01..ee0f559cf 100644
--- a/ipatests/test_ipapython/test_ipautil.py
+++ b/ipatests/test_ipapython/test_ipautil.py
@@ -24,6 +24,7 @@ import sys
import nose
import pytest
+import six
from ipapython import ipautil
@@ -132,9 +133,13 @@ class TestCIDict(object):
self.cidict.clear()
nose.tools.assert_equal(0, len(self.cidict))
assert self.cidict == {}
- assert self.cidict.keys() == []
- assert self.cidict.values() == []
- assert self.cidict.items() == []
+ assert list(self.cidict) == []
+ assert list(self.cidict.values()) == []
+ assert list(self.cidict.items()) == []
+ if six.PY2:
+ assert self.cidict.keys() == []
+ assert self.cidict.values() == []
+ assert self.cidict.items() == []
assert self.cidict._keys == {}
def test_copy(self):
@@ -145,7 +150,7 @@ class TestCIDict(object):
assert "key1" in copy
nose.tools.assert_equal("val1", copy["Key1"])
- @pytest.mark.skipif(sys.version_info >= (3, 0), reason="Python 2 only")
+ @pytest.mark.skipif(not six.PY2, reason="Python 2 only")
def test_haskey(self):
assert self.cidict.has_key("KEY1")
assert self.cidict.has_key("key2")
@@ -161,15 +166,15 @@ class TestCIDict(object):
assert "Key4" not in self.cidict
def test_items(self):
- items = self.cidict.items()
+ items = list(self.cidict.items())
nose.tools.assert_equal(3, len(items))
items_set = set(items)
assert ("Key1", "val1") in items_set
assert ("key2", "val2") in items_set
assert ("KEY3", "VAL3") in items_set
- assert self.cidict.items() == list(self.cidict.iteritems()) == zip(
- self.cidict.iterkeys(), self.cidict.itervalues())
+ assert list(self.cidict.items()) == list(self.cidict.iteritems()) == zip(
+ self.cidict.keys(), self.cidict.values())
def test_iter(self):
items = []
@@ -207,24 +212,24 @@ class TestCIDict(object):
assert "VAL3" in values_set
def test_keys(self):
- keys = self.cidict.keys()
+ keys = list(self.cidict.keys())
nose.tools.assert_equal(3, len(keys))
keys_set = set(keys)
assert "Key1" in keys_set
assert "key2" in keys_set
assert "KEY3" in keys_set
- assert self.cidict.keys() == list(self.cidict.iterkeys())
+ assert list(self.cidict.keys()) == list(self.cidict.iterkeys())
def test_values(self):
- values = self.cidict.values()
+ values = list(self.cidict.values())
nose.tools.assert_equal(3, len(values))
values_set = set(values)
assert "val1" in values_set
assert "val2" in values_set
assert "VAL3" in values_set
- assert self.cidict.values() == list(self.cidict.itervalues())
+ assert list(self.cidict.values()) == list(self.cidict.itervalues())
def test_update(self):
newdict = { "KEY2": "newval2",
@@ -232,7 +237,7 @@ class TestCIDict(object):
self.cidict.update(newdict)
nose.tools.assert_equal(4, len(self.cidict))
- items = self.cidict.items()
+ items = list(self.cidict.items())
nose.tools.assert_equal(4, len(items))
items_set = set(items)
assert ("Key1", "val1") in items_set
diff --git a/ipatests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py
index 28e84fb70..f50c19a92 100644
--- a/ipatests/test_ipaserver/test_ldap.py
+++ b/ipatests/test_ipaserver/test_ldap.py
@@ -211,7 +211,7 @@ class test_LDAPEntry(object):
def test_popitem(self):
e = self.entry
assert e.popitem() == ('cn', self.cn1)
- e.keys() == []
+ list(e) == []
def test_setdefault(self):
e = self.entry
diff --git a/ipatests/test_webui/ui_driver.py b/ipatests/test_webui/ui_driver.py
index 16af5ff16..d097a5490 100644
--- a/ipatests/test_webui/ui_driver.py
+++ b/ipatests/test_webui/ui_driver.py
@@ -154,7 +154,7 @@ class UI_driver(object):
c = self.config
# override with environmental variables
- for k, v in ENV_MAP.iteritems():
+ for k, v in ENV_MAP.items():
val = os.environ.get(k)
if val is not None:
c[v] = val
diff --git a/ipatests/test_xmlrpc/ldaptracker.py b/ipatests/test_xmlrpc/ldaptracker.py
index 9cc44f8a6..bf753a5c5 100644
--- a/ipatests/test_xmlrpc/ldaptracker.py
+++ b/ipatests/test_xmlrpc/ldaptracker.py
@@ -122,7 +122,7 @@ class Tracker(object):
args_repr = ', '.join(
[repr(a) for a in args] +
- ['%s=%r' % item for item in options.items()])
+ ['%s=%r' % item for item in list(options.items())])
try:
result = cmd(*args, **options)
except Exception as e:
diff --git a/ipatests/test_xmlrpc/test_pwpolicy_plugin.py b/ipatests/test_xmlrpc/test_pwpolicy_plugin.py
index 5a8ac1030..3739aa893 100644
--- a/ipatests/test_xmlrpc/test_pwpolicy_plugin.py
+++ b/ipatests/test_xmlrpc/test_pwpolicy_plugin.py
@@ -30,7 +30,6 @@ from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (XMLRPC_test, assert_attr_equal,
Declarative)
-
class test_pwpolicy(XMLRPC_test):
"""
Test the `pwpolicy` plugin.
@@ -195,7 +194,7 @@ class test_pwpolicy(XMLRPC_test):
# Test that returned values match the arguments
# Only test the second and third results; the first one was modified
for entry, expected in (result[1], self.kw2), (result[2], self.kw3):
- for name, value in expected.iteritems():
+ for name, value in expected.items():
assert_attr_equal(entry, name, str(value))
def test_c_pwpolicy_find_pkey_only(self):
diff --git a/ipatests/util.py b/ipatests/util.py
index 03c5488f1..5a6595a62 100644
--- a/ipatests/util.py
+++ b/ipatests/util.py
@@ -468,7 +468,7 @@ def get_api(**kw):
home = TempHome()
api = ipalib.create_api(mode='unit_test')
api.env.in_tree = True
- for (key, value) in kw.iteritems():
+ for (key, value) in kw.items():
api.env[key] = value
return (api, home)
@@ -483,7 +483,7 @@ def create_test_api(**kw):
home = TempHome()
api = ipalib.create_api(mode='unit_test')
api.env.in_tree = True
- for (key, value) in kw.iteritems():
+ for (key, value) in kw.items():
api.env[key] = value
return (api, home)
generated by cgit (git 2.34.1) at 2024-06-21 06:18:16 +0000