Merge "Bugfix: KeyError when using http dispatcher"

[yardstick.git] / tests / unit / common / test_utils.py

diff --git a/tests/unit/common/test_utils.py b/tests/unit/common/test_utils.py
index a64c1f1..8f52b53 100644 (file)
--- a/tests/unit/common/test_utils.py
+++ b/tests/unit/common/test_utils.py
@@ -9,6 +9,7 @@
 
 # Unittest for yardstick.common.utils
 
+from __future__ import absolute_import
 import os
 import mock
 import unittest
@@ -17,9 +18,10 @@ from yardstick.common import utils
 
 
 class IterSubclassesTestCase(unittest.TestCase):
-# Disclaimer: this class is a modified copy from
-# rally/tests/unit/common/plugin/test_discover.py
-# Copyright 2015: Mirantis Inc.
+    # Disclaimer: this class is a modified copy from
+    # rally/tests/unit/common/plugin/test_discover.py
+    # Copyright 2015: Mirantis Inc.
+
     def test_itersubclasses(self):
         class A(object):
             pass
@@ -85,24 +87,21 @@ class ImportModulesFromPackageTestCase(unittest.TestCase):
 
 class GetParaFromYaml(unittest.TestCase):
 
-    def test_get_para_from_yaml_file_not_exist(self):
-        file_path = '/etc/yardstick/hello.yaml'
-        args = 'hello.world'
-        para = utils.get_para_from_yaml(file_path, args)
-        self.assertIsNone(para)
-
-    def test_get_para_from_yaml_para_not_found(self):
+    @mock.patch('yardstick.common.utils.os.environ.get')
+    def test_get_param_para_not_found(self, get_env):
         file_path = 'config_sample.yaml'
-        file_path = self._get_file_abspath(file_path)
+        get_env.return_value = self._get_file_abspath(file_path)
         args = 'releng.file'
-        self.assertIsNone(utils.get_para_from_yaml(file_path, args))
+        default = 'hello'
+        self.assertTrue(utils.get_param(args, default), default)
 
-    def test_get_para_from_yaml_para_exists(self):
+    @mock.patch('yardstick.common.utils.os.environ.get')
+    def test_get_param_para_exists(self, get_env):
         file_path = 'config_sample.yaml'
-        file_path = self._get_file_abspath(file_path)
+        get_env.return_value = self._get_file_abspath(file_path)
         args = 'releng.dir'
         para = '/home/opnfv/repos/releng'
-        self.assertEqual(para, utils.get_para_from_yaml(file_path, args))
+        self.assertEqual(para, utils.get_param(args))
 
     def _get_file_abspath(self, filename):
         curr_path = os.path.dirname(os.path.abspath(__file__))