aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-02-06 13:58:40 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-06 13:58:40 +0000
commit8ce8d3e9b4144c221be476755cc4c4311f20bc9f (patch)
tree481938a18fa918a96eb003ea9b8d571486abf61e
parent18901fa91bbc16d8dec39ef62ecd105b83469e02 (diff)
parentb8648aa157d36e93fcd7849e41985ff88222de44 (diff)
Merge "Change log level when pod, scenario or build_tag cannot be retrieved"
-rw-r--r--functest/tests/unit/utils/test_functest_utils.py34
-rw-r--r--functest/utils/functest_utils.py11
2 files changed, 24 insertions, 21 deletions
diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py
index ce9086a7..bb836011 100644
--- a/functest/tests/unit/utils/test_functest_utils.py
+++ b/functest/tests/unit/utils/test_functest_utils.py
@@ -131,15 +131,17 @@ class FunctestUtilsTesting(unittest.TestCase):
self.assertEqual(functest_utils.get_installer_type(),
self.installer)
- @mock.patch('functest.utils.functest_utils.logger.error')
- def test_get_scenario_failed(self, mock_logger_error):
+ @mock.patch('functest.utils.functest_utils.logger.info')
+ def test_get_scenario_failed(self, mock_logger_info):
with mock.patch.dict(os.environ,
{},
clear=True):
self.assertEqual(functest_utils.get_scenario(),
- "Unknown_scenario")
- mock_logger_error.assert_called_once_with("Impossible to retrieve"
- " the scenario")
+ "os-nosdn-nofeature-noha")
+ mock_logger_info.assert_called_once_with("Impossible to retrieve "
+ "the scenario.Use "
+ "default "
+ "os-nosdn-nofeature-noha")
def test_get_scenario_default(self):
with mock.patch.dict(os.environ,
@@ -158,17 +160,17 @@ class FunctestUtilsTesting(unittest.TestCase):
mock_get_build_tag.return_value = "unknown_build_tag"
self.assertEqual(functest_utils.get_version(), "unknown")
- @mock.patch('functest.utils.functest_utils.logger.error')
- def test_get_pod_name_failed(self, mock_logger_error):
+ @mock.patch('functest.utils.functest_utils.logger.info')
+ def test_get_pod_name_failed(self, mock_logger_info):
with mock.patch.dict(os.environ,
{},
clear=True):
self.assertEqual(functest_utils.get_pod_name(),
"unknown-pod")
- mock_logger_error.assert_called_once_with("Unable to retrieve "
- "the POD name from "
- "environment. Using "
- "pod name 'unknown-pod'")
+ mock_logger_info.assert_called_once_with("Unable to retrieve "
+ "the POD name from "
+ "environment. Using "
+ "pod name 'unknown-pod'")
def test_get_pod_name_default(self):
with mock.patch.dict(os.environ,
@@ -177,15 +179,15 @@ class FunctestUtilsTesting(unittest.TestCase):
self.assertEqual(functest_utils.get_pod_name(),
self.node_name)
- @mock.patch('functest.utils.functest_utils.logger.error')
- def test_get_build_tag_failed(self, mock_logger_error):
+ @mock.patch('functest.utils.functest_utils.logger.info')
+ def test_get_build_tag_failed(self, mock_logger_info):
with mock.patch.dict(os.environ,
{},
clear=True):
self.assertEqual(functest_utils.get_build_tag(),
- "unknown_build_tag")
- mock_logger_error.assert_called_once_with("Impossible to retrieve"
- " the build tag")
+ "none")
+ mock_logger_info.assert_called_once_with("Impossible to retrieve"
+ " the build tag")
def test_get_build_tag_default(self):
with mock.patch.dict(os.environ,
diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index 2bf87a05..04055464 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -96,8 +96,9 @@ def get_scenario():
try:
scenario = os.environ['DEPLOY_SCENARIO']
except KeyError:
- logger.error("Impossible to retrieve the scenario")
- scenario = "Unknown_scenario"
+ logger.info("Impossible to retrieve the scenario."
+ "Use default os-nosdn-nofeature-noha")
+ scenario = "os-nosdn-nofeature-noha"
return scenario
@@ -128,7 +129,7 @@ def get_pod_name():
try:
return os.environ['NODE_NAME']
except KeyError:
- logger.error(
+ logger.info(
"Unable to retrieve the POD name from environment. " +
"Using pod name 'unknown-pod'")
return "unknown-pod"
@@ -141,8 +142,8 @@ def get_build_tag():
try:
build_tag = os.environ['BUILD_TAG']
except KeyError:
- logger.error("Impossible to retrieve the build tag")
- build_tag = "unknown_build_tag"
+ logger.info("Impossible to retrieve the build tag")
+ build_tag = "none"
return build_tag