Merge "KVMFORNFV: Update Grafana config for Packet Forwarding test cases."

[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 094ab2b..6632262 100644 (file)
--- a/tests/unit/common/test_utils.py
+++ b/tests/unit/common/test_utils.py
@@ -155,7 +155,7 @@ class TestMacAddressToHex(unittest.TestCase):
         self.assertEqual(utils.mac_address_to_hex_list("ea:3e:e1:9a:99:e8"),
                          ['0xea', '0x3e', '0xe1', '0x9a', '0x99', '0xe8'])
 
-                         
+
 class TranslateToStrTestCase(unittest.TestCase):
 
     def test_translate_to_str_unicode(self):
@@ -268,7 +268,7 @@ address sizes   : 46 bits physical, 48 bits virtual
 power management:
 
 """
-        socket_map = utils.parse_cpuinfo(cpuinfo)
+        socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo)
         assert sorted(socket_map.keys()) == [0]
         assert sorted(socket_map[0].keys()) == [2, 3, 4]
 
@@ -356,7 +356,7 @@ address sizes   : 39 bits physical, 48 bits virtual
 power management:
 
 """
-        socket_map = utils.parse_cpuinfo(cpuinfo)
+        socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo)
         assert sorted(socket_map.keys()) == [0]
         assert sorted(socket_map[0].keys()) == [1, 2, 3]
         assert sorted(socket_map[0][1]) == [5]
@@ -555,7 +555,7 @@ address sizes   : 46 bits physical, 48 bits virtual
 power management:
 
 """
-        socket_map = utils.parse_cpuinfo(cpuinfo)
+        socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo)
         assert sorted(socket_map.keys()) == [0, 1]
         assert sorted(socket_map[0].keys()) == [0, 1, 2]
         assert sorted(socket_map[1].keys()) == [26, 27, 28]
@@ -758,7 +758,7 @@ address sizes   : 46 bits physical, 48 bits virtual
 power management:
 
 """
-        socket_map = utils.parse_cpuinfo(cpuinfo)
+        socket_map = utils.SocketTopology.parse_cpuinfo(cpuinfo)
         processors = socket_map.processors()
         assert processors == [1, 2, 43, 44, 85, 86, 87]
         cores = socket_map.cores()
@@ -917,6 +917,32 @@ class TestUtils(unittest.TestCase):
         result = utils.parse_ini_file('my_path')
         self.assertDictEqual(result, expected)
 
+    def test_join_non_strings(self):
+        self.assertEqual(utils.join_non_strings(':'), '')
+        self.assertEqual(utils.join_non_strings(':', 'a'), 'a')
+        self.assertEqual(utils.join_non_strings(':', 'a', 2, 'c'), 'a:2:c')
+        self.assertEqual(utils.join_non_strings(':', ['a', 2, 'c']), 'a:2:c')
+        self.assertEqual(utils.join_non_strings(':', 'abc'), 'abc')
+
+    def test_validate_non_string_sequence(self):
+        self.assertEqual(utils.validate_non_string_sequence([1, 2, 3]), [1, 2, 3])
+        self.assertIsNone(utils.validate_non_string_sequence('123'))
+        self.assertIsNone(utils.validate_non_string_sequence(1))
+
+        self.assertEqual(utils.validate_non_string_sequence(1, 2), 2)
+        self.assertEqual(utils.validate_non_string_sequence(1, default=2), 2)
+
+        with self.assertRaises(RuntimeError):
+            utils.validate_non_string_sequence(1, raise_exc=RuntimeError)
+
+    def test_error_class(self):
+        with self.assertRaises(RuntimeError):
+            utils.ErrorClass()
+
+        error_instance = utils.ErrorClass(test='')
+        with self.assertRaises(AttributeError):
+            error_instance.get_name()
+
 
 class TestUtilsIpAddrMethods(unittest.TestCase):