Merge "Yardstick API architecture improvement"

2 files changed, 23 insertions, 41 deletions

diff --git a/tests/unit/apiserver/utils/test_common.py b/tests/unit/apiserver/utils/test_common.py
deleted file mode 100644
index ad81cb76b..000000000
--- a/tests/unit/apiserver/utils/test_common.py
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-from __future__ import absolute_import
-import unittest
-
-from api.utils import common
-
-
-class TranslateToStrTestCase(unittest.TestCase):
-
-    def test_translate_to_str_unicode(self):
-        input_str = u'hello'
-        output_str = common.translate_to_str(input_str)
-
-        result = 'hello'
-        self.assertEqual(result, output_str)
-
-    def test_translate_to_str_dict_list_unicode(self):
-        input_str = {
-            u'hello': {u'hello': [u'world']}
-        }
-        output_str = common.translate_to_str(input_str)
-
-        result = {
-            'hello': {'hello': ['world']}
-        }
-        self.assertEqual(result, output_str)
-
-
-def main():
-    unittest.main()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/common/test_utils.py b/tests/unit/common/test_utils.py
index c4c61ceeb..7f260cfe6 100644
--- a/tests/unit/common/test_utils.py
+++ b/tests/unit/common/test_utils.py
@@ -110,6 +110,7 @@ class GetParaFromYaml(unittest.TestCase):
 
 
 class CommonUtilTestCase(unittest.TestCase):
+
     def setUp(self):
         self.data = {
             "benchmark": {
@@ -128,6 +129,7 @@ class CommonUtilTestCase(unittest.TestCase):
                 }
             }
         }
+
     def test__dict_key_flatten(self):
         line = 'mpstat.loadavg1=0.29,rtt=1.03,mpstat.loadavg0=1.09,' \
                'mpstat.cpu0.%idle=99.00,mpstat.cpu0.%sys=0.00'
@@ -140,6 +142,27 @@ class CommonUtilTestCase(unittest.TestCase):
         self.assertEqual(result, line)
 
 
+class TranslateToStrTestCase(unittest.TestCase):
+
+    def test_translate_to_str_unicode(self):
+        input_str = u'hello'
+        output_str = utils.translate_to_str(input_str)
+
+        result = 'hello'
+        self.assertEqual(result, output_str)
+
+    def test_translate_to_str_dict_list_unicode(self):
+        input_str = {
+            u'hello': {u'hello': [u'world']}
+        }
+        output_str = utils.translate_to_str(input_str)
+
+        result = {
+            'hello': {'hello': ['world']}
+        }
+        self.assertEqual(result, output_str)
+
+
 def main():
     unittest.main()