Merge "Add NUMA pinning support for node context"

[yardstick.git] / tests / unit / benchmark / scenarios / compute / test_memload.py

diff --git a/tests/unit/benchmark/scenarios/compute/test_memload.py b/tests/unit/benchmark/scenarios/compute/test_memload.py
index cdf518d..ede3309 100644 (file)
--- a/tests/unit/benchmark/scenarios/compute/test_memload.py
+++ b/tests/unit/benchmark/scenarios/compute/test_memload.py
@@ -11,6 +11,7 @@
 
 # Unittest for yardstick.benchmark.scenarios.compute.memload.MEMLoad
 
+from __future__ import absolute_import
 import mock
 import unittest
 import os
@@ -73,16 +74,33 @@ class MEMLoadTestCase(unittest.TestCase):
         output = self._read_file("memload_sample_output.txt")
         mock_ssh.SSH().execute.return_value = (0, output, '')
         result = m._get_mem_usage()
-        expected_result = {"max": {"used": 76737332, "cached": 67252400,
-                           "free": 187016644, "shared": 2844,
-                           "total": 263753976, "buffers": 853528},
-                           "average": {"used": 76737332, "cached": 67252400,
-                           "free": 187016644, "shared": 2844,
-                           "total": 263753976, "buffers": 853528},
-                           "free": {"memory0": {"used": "76737332",
-                           "cached": "67252400", "free": "187016644",
-                           "shared": "2844", "total": "263753976",
-                           "buffers": "853528"}}}
+        expected_result = {
+            "max": {
+                'shared': 2844,
+                'buff/cache': 853528,
+                'total': 263753976,
+                'free': 187016644,
+                'used': 76737332
+            },
+            "average": {
+                'shared': 2844,
+                'buff/cache': 853528,
+                'total': 263753976,
+                'free': 187016644,
+                'used': 76737332
+            },
+            "free": {
+                "memory0": {
+                    "used": "76737332",
+                    "buff/cache": "853528",
+                    "free": "187016644",
+                    "shared": "2844",
+                    "total": "263753976",
+                    "available": "67252400"
+                }
+            }
+        }
+
         self.assertEqual(result, expected_result)
 
     def _read_file(self, filename):
@@ -92,3 +110,10 @@ class MEMLoadTestCase(unittest.TestCase):
             sample_output = f.read()
         return sample_output
 
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()