Fix more tests on Python 3

* HTTP body type is bytes
* query.py: Exception.message attribute was removed on Python 3
* mock calls cannot be sorted (mock calls are not comparable), use
  the assert_has_calls() with any_order=True instead.
* Port decode_unicode() on Python 3: decode bytes from UTF-8 on Python 3
  instead of encoding Unicode to UTF-8
* MeterDefinitionException: add message attribute
* tox.ini: add more tests to Python 3.4

Change-Id: Iadd1c83b250d2f941262cc6e7dba4c27cb56893d

1 files changed, 3 insertions, 1 deletions

diff --git a/ceilometer/utils.py b/ceilometer/utils.py
index 5405b599..42e2c20c 100644
--- a/ceilometer/utils.py
+++ b/ceilometer/utils.py
@@ -73,8 +73,10 @@ def decode_unicode(input):
         # the tuple would become list. So we have to generate the value as
         # list here.
         return [decode_unicode(element) for element in input]
-    elif isinstance(input, six.text_type):
+    elif six.PY2 and isinstance(input, six.text_type):
         return input.encode('utf-8')
+    elif six.PY3 and isinstance(input, six.binary_type):
+        return input.decode('utf-8')
     else:
         return input