summaryrefslogtreecommitdiff
path: root/ironic/tests/base.py
diff options
context:
space:
mode:
authorVictor Sergeyev <vsergeyev@mirantis.com>2014-12-30 13:50:27 +0200
committerVictor Sergeyev <vsergeyev@mirantis.com>2015-05-06 11:51:44 +0300
commit70062322a240353989babeddfb904b487a42d668 (patch)
treeb914ca4a6c2a9df5f79f14a7abdc5c716dc128c5 /ironic/tests/base.py
parent1961523996f1f0a88f2e3871c902dd7426ba25f5 (diff)
downloadironic-70062322a240353989babeddfb904b487a42d668.tar.gz
Run tests in py34 environment
A lot of fixes to be compatible with python 3: - fix encoding/decoding errors - fix issues with comparison - use `reload`, `reraise`, ext. modules from six - use items() instead of iteritems() - add a new file with py3 specific test requirements - drop passing the arbitrary arguments to object.__new__ method. See bug [1] for more details. - add a workaround to bug in `mock` library - add py33 and py34 test environment to tox.ini [1] http://bugs.python.org/issue1683368 Change-Id: I90936cb6b6eaaf4b5e1ce67732caec3c8bdc1cc2
Diffstat (limited to 'ironic/tests/base.py')
-rw-r--r--ironic/tests/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic/tests/base.py b/ironic/tests/base.py
index f7d11e0eb..077fb18e6 100644
--- a/ironic/tests/base.py
+++ b/ironic/tests/base.py
@@ -124,7 +124,7 @@ class TestCase(testtools.TestCase):
def config(self, **kw):
"""Override config options for a test."""
group = kw.pop('group', None)
- for k, v in kw.iteritems():
+ for k, v in kw.items():
CONF.set_override(k, v, group)
def path_get(self, project_file=None):