standardize ssh auth

[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 76625ef..ebae999 100644 (file)
--- a/tests/unit/benchmark/scenarios/compute/test_memload.py
+++ b/tests/unit/benchmark/scenarios/compute/test_memload.py
@@ -35,7 +35,7 @@ class MEMLoadTestCase(unittest.TestCase):
 
     def test_memload_successful_setup(self, mock_ssh):
         m = memload.MEMLoad({}, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
 
         m.setup()
         self.assertIsNotNone(m.client)
@@ -43,20 +43,20 @@ class MEMLoadTestCase(unittest.TestCase):
 
     def test_execute_command_success(self, mock_ssh):
         m = memload.MEMLoad({}, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         m.setup()
 
         expected_result = 'abcdefg'
-        mock_ssh.SSH().execute.return_value = (0, expected_result, '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, expected_result, '')
         result = m._execute_command("foo")
         self.assertEqual(result, expected_result)
 
     def test_execute_command_failed(self, mock_ssh):
         m = memload.MEMLoad({}, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         m.setup()
 
-        mock_ssh.SSH().execute.return_value = (127, '', 'Failed executing \
+        mock_ssh.SSH.from_node().execute.return_value = (127, '', 'Failed executing \
                                                command')
         self.assertRaises(RuntimeError, m._execute_command,
                           "cat /proc/meminfo")
@@ -68,24 +68,39 @@ class MEMLoadTestCase(unittest.TestCase):
         }
         args = {"options": options}
         m = memload.MEMLoad(args, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         m.setup()
 
         output = self._read_file("memload_sample_output.txt")
-        mock_ssh.SSH().execute.return_value = (0, output, '')
+        mock_ssh.SSH.from_node().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):
@@ -94,3 +109,11 @@ class MEMLoadTestCase(unittest.TestCase):
         with open(output) as f:
             sample_output = f.read()
         return sample_output
+
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()