Merge remote-tracking branch 'cacarrara/add-tests-for-memory-get-buddy-info-v3'

Signed-off-by: NCleber Rosa <crosa@redhat.com>

avocado/utils/memory.py

@@ -350,6 +350,13 @@ def read_from_numa_maps(pid, key):
         return numa_maps_dict
 
 
+def _get_buddy_info_content():
+    buddy_info_content = ''
+    with open("/proc/buddyinfo") as buddy_info:
+        buddy_info_content = buddy_info.read()
+    return buddy_info_content
+
+
 def get_buddy_info(chunk_sizes, nodes="all", zones="all"):
     """
     Get the fragement status of the host.
@@ -378,45 +385,44 @@ def get_buddy_info(chunk_sizes, nodes="all", zones="all"):
     :return: A dict using the chunk_size as the keys
     :rtype: dict
     """
-    with open("/proc/buddyinfo") as buddy_info:
-        buddy_info_content = buddy_info.read()
+    buddy_info_content = _get_buddy_info_content()
+
+    re_buddyinfo = r"Node\s+"
+    if nodes == "all":
+        re_buddyinfo += r"(\d+)"
+    else:
+        re_buddyinfo += "(%s)" % "|".join(nodes.split())
+
+    if not re.findall(re_buddyinfo, buddy_info_content):
+        logging.warn("Can not find Nodes %s" % nodes)
+        return None
+    re_buddyinfo += r".*?zone\s+"
+    if zones == "all":
+        re_buddyinfo += r"(\w+)"
+    else:
+        re_buddyinfo += "(%s)" % "|".join(zones.split())
+    if not re.findall(re_buddyinfo, buddy_info_content):
+        logging.warn("Can not find zones %s" % zones)
+        return None
+    re_buddyinfo += r"\s+([\s\d]+)"
+
+    buddy_list = re.findall(re_buddyinfo, buddy_info_content)
+
+    if re.findall("[<>=]", chunk_sizes) and buddy_list:
+        size_list = range(len(buddy_list[-1][-1].strip().split()))
+        chunk_sizes = [str(_) for _ in size_list if eval("%s %s" % (_,
+                                                                    chunk_sizes))]
+
+        chunk_sizes = ' '.join(chunk_sizes)
+
+    buddyinfo_dict = {}
+    for chunk_size in chunk_sizes.split():
+        buddyinfo_dict[chunk_size] = 0
+        for _, _, chunk_info in buddy_list:
+            chunk_info = chunk_info.strip().split()[int(chunk_size)]
+            buddyinfo_dict[chunk_size] += int(chunk_info)
 
-        re_buddyinfo = r"Node\s+"
-        if nodes == "all":
-            re_buddyinfo += r"(\d+)"
-        else:
-            re_buddyinfo += "(%s)" % "|".join(nodes.split())
-
-        if not re.findall(re_buddyinfo, buddy_info_content):
-            logging.warn("Can not find Nodes %s" % nodes)
-            return None
-        re_buddyinfo += r".*?zone\s+"
-        if zones == "all":
-            re_buddyinfo += r"(\w+)"
-        else:
-            re_buddyinfo += "(%s)" % "|".join(zones.split())
-        if not re.findall(re_buddyinfo, buddy_info_content):
-            logging.warn("Can not find zones %s" % zones)
-            return None
-        re_buddyinfo += r"\s+([\s\d]+)"
-
-        buddy_list = re.findall(re_buddyinfo, buddy_info_content)
-
-        if re.findall("[<>=]", chunk_sizes) and buddy_list:
-            size_list = range(len(buddy_list[-1][-1].strip().split()))
-            chunk_sizes = [str(_) for _ in size_list if eval("%s %s" % (_,
-                                                                        chunk_sizes))]
-
-            chunk_sizes = ' '.join(chunk_sizes)
-
-        buddyinfo_dict = {}
-        for chunk_size in chunk_sizes.split():
-            buddyinfo_dict[chunk_size] = 0
-            for _, _, chunk_info in buddy_list:
-                chunk_info = chunk_info.strip().split()[int(chunk_size)]
-                buddyinfo_dict[chunk_size] += int(chunk_info)
-
-        return buddyinfo_dict
+    return buddyinfo_dict
 
 
 def set_thp_value(feature, value):

selftests/unit/test_utils_memory.py

@@ -20,5 +20,80 @@ class UtilsMemoryTest(unittest.TestCase):
                     self.assertEqual(memory.numa_nodes_with_memory(), exp)
 
 
+BUDDY_INFO_RESPONSE = '\n'.join([
+    'Node 0, zone      DMA      1      1      0      0      1      1',
+    'Node 0, zone    DMA32    987    679   1004   3068   2795   1432',
+    'Node 1, zone   Normal   5430   9759   9044   9751  16482   8924',
+])
+
+
+@mock.patch('avocado.utils.memory._get_buddy_info_content', return_value=BUDDY_INFO_RESPONSE)
+class UtilsMemoryTestGetBuddyInfo(unittest.TestCase):
+
+    def test_get_buddy_info_simple_chunk_size(self, buddy_info_content_mocked):
+        chunk_size = '0'
+        result = memory.get_buddy_info(chunk_size)
+        self.assertEqual(result[chunk_size], 6418)
+
+    def test_get_buddy_info_less_than_chunk_size(self, buddy_info_content_mocked):
+        chunk_size = '<2'
+        result = memory.get_buddy_info(chunk_size)
+        self.assertEqual(result['0'], 6418)
+        self.assertEqual(result['1'], 10439)
+
+    def test_get_buddy_info_less_than_equal_chunk_size(self, buddy_info_content_mocked):
+        chunk_size = '<=2'
+        result = memory.get_buddy_info(chunk_size)
+        self.assertEqual(result['0'], 6418)
+        self.assertEqual(result['1'], 10439)
+        self.assertEqual(result['2'], 10048)
+
+    def test_get_buddy_info_greater_than_chunk_size(self, buddy_info_content_mocked):
+        chunk_size = '>3'
+        result = memory.get_buddy_info(chunk_size)
+        self.assertEqual(result['4'], 19278)
+        self.assertEqual(result['5'], 10357)
+
+    def test_get_buddy_info_greater_than_equal_chunk_size(self, buddy_info_content_mocked):
+        chunk_size = '>=3'
+        result = memory.get_buddy_info(chunk_size)
+        self.assertEqual(result['3'], 12819)
+        self.assertEqual(result['4'], 19278)
+        self.assertEqual(result['5'], 10357)
+
+    def test_get_buddy_info_multiple_chunk_size(self, buddy_info_content_mocked):
+        chunk_size = '2 4'
+        result = memory.get_buddy_info(chunk_size)
+        self.assertEqual(result['2'], 10048)
+        self.assertEqual(result['4'], 19278)
+
+    def test_get_buddy_info_multiple_chunk_size_filtering_simple(self, buddy_info_content_mocked):
+        chunk_size = '>2 <4'
+        result = memory.get_buddy_info(chunk_size)
+        self.assertEqual(result['3'], 12819)
+
+    def test_get_buddy_info_multiple_chunk_size_filtering(self, buddy_info_content_mocked):
+        chunk_size = '>=2 <=4'
+        result = memory.get_buddy_info(chunk_size)
+        self.assertEqual(result['2'], 10048)
+        self.assertEqual(result['3'], 12819)
+        self.assertEqual(result['4'], 19278)
+
+    def test_get_buddy_info_multiple_chunk_size_filtering_invalid(self, buddy_info_content_mocked):
+        chunk_size = '>2 <2'
+        result = memory.get_buddy_info(chunk_size)
+        self.assertEqual(result, {})
+
+    def test_get_buddy_info_filtering_node(self, buddy_info_content_mocked):
+        chunk_size = '0'
+        result = memory.get_buddy_info(chunk_size, nodes='1')
+        self.assertEqual(result[chunk_size], 5430)
+
+    def test_get_buddy_info_filtering_zone(self, buddy_info_content_mocked):
+        chunk_size = '0'
+        result = memory.get_buddy_info(chunk_size, zones='DMA32')
+        self.assertEqual(result[chunk_size], 987)
+
+
 if __name__ == '__main__':
     unittest.main()