aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-12-12 13:59:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-12 13:59:30 +0000
commit250a7936cc34e2e22c7a9a8f766c9ee0bdcb9f4c (patch)
treefc67c0232f04661a6cc037f44cc4c1b14720e8e4
parenta6a900f1032ef0c65996a71812b62811e46b840d (diff)
parent55733974628202786705227b7d6e9bb50558823d (diff)
Merge "Add python3 support in energy"
-rw-r--r--functest/energy/energy.py6
-rw-r--r--functest/tests/unit/energy/test_functest_energy.py2
-rw-r--r--tox.ini3
3 files changed, 7 insertions, 4 deletions
diff --git a/functest/energy/energy.py b/functest/energy/energy.py
index 119942bb..2835e05c 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 99110802..9e19a33d 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 328eccd2..9d5988a6 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}