From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 12 Dec 2017 04:36:53 +0000 (+0100)
Subject: Add python3 support in energy
X-Git-Tag: opnfv-6.0.0~276^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F48681%2F3;p=functest.git

Add python3 support in energy

It also converts Exception to str when expected.
All energy modules are also listed in files rated 10/10 by pylint.

Change-Id: Id382d60eb35f50c98b15423f9559a920ce5dac62
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/functest/energy/energy.py b/functest/energy/energy.py
index 119942bbf..2835e05c1 100644
--- a/functest/energy/energy.py
+++ b/functest/energy/energy.py
@@ -12,10 +12,10 @@
 
 import json
 import logging
-import urllib
 
 from functools import wraps
 import requests
+from six.moves import urllib
 
 from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
@@ -103,7 +103,7 @@ class EnergyRecorder(object):
             assert environment
 
             uri_comp = "/recorders/environment/"
-            uri_comp += urllib.quote_plus(environment)
+            uri_comp += urllib.parse.quote_plus(environment)
 
             # Creds
             creds_usr = ft_utils.get_functest_config(
@@ -130,7 +130,7 @@ class EnergyRecorder(object):
             except Exception as exc:  # pylint: disable=broad-except
                 EnergyRecorder.logger.info(
                     "Energy recorder API is not available, cause=%s",
-                    exc.message)
+                    str(exc))
                 api_available = False
             # Final config
             EnergyRecorder.energy_recorder_api = {
diff --git a/functest/tests/unit/energy/test_functest_energy.py b/functest/tests/unit/energy/test_functest_energy.py
index 99110802e..9e19a33df 100644
--- a/functest/tests/unit/energy/test_functest_energy.py
+++ b/functest/tests/unit/energy/test_functest_energy.py
@@ -266,7 +266,7 @@ class EnergyRecorderTest(unittest.TestCase):
         with self.assertRaises(Exception) as context:
             self.__decorated_method_with_ex()
         self.assertTrue(
-            self.exception_message_to_preserve in context.exception
+            self.exception_message_to_preserve in str(context.exception)
         )
         self.assertTrue(finish_mock.called)
 
diff --git a/tox.ini b/tox.ini
index 328eccd21..9d5988a6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,8 +31,10 @@ whitelist_externals = bash
 modules =
   functest.api
   functest.core
+  functest.energy
   functest.opnfv_tests.sdn.odl
   functest.tests.unit.core
+  functest.tests.unit.energy
   functest.tests.unit.odl
   functest.tests.unit.utils.test_decorators
   functest.utils.decorators
@@ -56,6 +58,7 @@ commands =
 dirs =
   functest/tests/unit/ci
   functest/tests/unit/core
+  functest/tests/unit/energy
   functest/tests/unit/odl
   functest/tests/unit/utils
 commands = nosetests {[testenv:py35]dirs}