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

1 files changed, 6 insertions, 2 deletions

diff --git a/ironic/drivers/modules/amt/common.py b/ironic/drivers/modules/amt/common.py
index 9cacb31e3..3ab52d4f8 100644
--- a/ironic/drivers/modules/amt/common.py
+++ b/ironic/drivers/modules/amt/common.py
@@ -151,7 +151,9 @@ def parse_driver_info(node):
     for param in REQUIRED_PROPERTIES:
         value = info.get(param)
         if value:
-            d_info[param[4:]] = six.binary_type(value)
+            if not isinstance(value, six.binary_type):
+                value = value.encode()
+            d_info[param[4:]] = value
         else:
             missing_info.append(param)
 
@@ -166,7 +168,9 @@ def parse_driver_info(node):
     if protocol not in AMT_PROTOCOL_PORT_MAP:
         raise exception.InvalidParameterValue(_("Invalid "
                 "protocol %s.") % protocol)
-    d_info[param[4:]] = six.binary_type(protocol)
+    if not isinstance(value, six.binary_type):
+        protocol = protocol.encode()
+    d_info[param[4:]] = protocol
 
     return d_info