Merge "standardize ssh auth"

[yardstick.git] / tests / unit / benchmark / scenarios / availability / test_result_checker_general.py

diff --git a/tests/unit/benchmark/scenarios/availability/test_result_checker_general.py b/tests/unit/benchmark/scenarios/availability/test_result_checker_general.py
index bbadf0a..d036bb0 100644 (file)
--- a/tests/unit/benchmark/scenarios/availability/test_result_checker_general.py
+++ b/tests/unit/benchmark/scenarios/availability/test_result_checker_general.py
@@ -12,11 +12,13 @@
 # Unittest for yardstick.benchmark.scenarios.availability.result_checker
 # .result_checker_general
 
+from __future__ import absolute_import
 import mock
 import unittest
 import copy
 
-from yardstick.benchmark.scenarios.availability.result_checker import  result_checker_general
+from yardstick.benchmark.scenarios.availability.result_checker import \
+    result_checker_general
 
 
 @mock.patch('yardstick.benchmark.scenarios.availability.result_checker.'
@@ -35,17 +37,17 @@ class GeneralResultCheckerTestCase(unittest.TestCase):
         self.checker_cfg = {
             'parameter': {'processname': 'process'},
             'checker_type': 'general-result-checker',
-            'condition' : 'eq',
-            'expectedValue' : 1,
-            'key' : 'process-checker',
-            'checker_key' : 'process-checker',
+            'condition': 'eq',
+            'expectedValue': 1,
+            'key': 'process-checker',
+            'checker_key': 'process-checker',
             'host': 'node1'
         }
 
     def test__result_checker_eq(self, mock_open, mock_ssh):
         ins = result_checker_general.GeneralResultChecker(self.checker_cfg,
-            self.context);
-        mock_ssh.SSH().execute.return_value = (0, "1", '')
+                                                          self.context)
+        mock_ssh.SSH.from_node().execute.return_value = (0, "1", '')
         ins.setup()
         self.assertTrue(ins.verify())
 
@@ -53,8 +55,8 @@ class GeneralResultCheckerTestCase(unittest.TestCase):
         config = copy.deepcopy(self.checker_cfg)
         config['condition'] = 'gt'
         ins = result_checker_general.GeneralResultChecker(config,
-            self.context);
-        mock_ssh.SSH().execute.return_value = (0, "2", '')
+                                                          self.context)
+        mock_ssh.SSH.from_node().execute.return_value = (0, "2", '')
         ins.setup()
         self.assertTrue(ins.verify())
 
@@ -62,8 +64,8 @@ class GeneralResultCheckerTestCase(unittest.TestCase):
         config = copy.deepcopy(self.checker_cfg)
         config['condition'] = 'gt_eq'
         ins = result_checker_general.GeneralResultChecker(config,
-            self.context);
-        mock_ssh.SSH().execute.return_value = (0, "1", '')
+                                                          self.context)
+        mock_ssh.SSH.from_node().execute.return_value = (0, "1", '')
         ins.setup()
         self.assertTrue(ins.verify())
 
@@ -71,8 +73,8 @@ class GeneralResultCheckerTestCase(unittest.TestCase):
         config = copy.deepcopy(self.checker_cfg)
         config['condition'] = 'lt'
         ins = result_checker_general.GeneralResultChecker(config,
-            self.context);
-        mock_ssh.SSH().execute.return_value = (0, "0", '')
+                                                          self.context)
+        mock_ssh.SSH.from_node().execute.return_value = (0, "0", '')
         ins.setup()
         self.assertTrue(ins.verify())
 
@@ -80,8 +82,8 @@ class GeneralResultCheckerTestCase(unittest.TestCase):
         config = copy.deepcopy(self.checker_cfg)
         config['condition'] = 'lt_eq'
         ins = result_checker_general.GeneralResultChecker(config,
-            self.context);
-        mock_ssh.SSH().execute.return_value = (0, "1", '')
+                                                          self.context)
+        mock_ssh.SSH.from_node().execute.return_value = (0, "1", '')
         ins.setup()
         self.assertTrue(ins.verify())
 
@@ -90,8 +92,8 @@ class GeneralResultCheckerTestCase(unittest.TestCase):
         config['condition'] = 'in'
         config['expectedValue'] = "value"
         ins = result_checker_general.GeneralResultChecker(config,
-            self.context);
-        mock_ssh.SSH().execute.return_value = (0, "value return", '')
+                                                          self.context)
+        mock_ssh.SSH.from_node().execute.return_value = (0, "value return", '')
         ins.setup()
         self.assertTrue(ins.verify())
 
@@ -99,8 +101,8 @@ class GeneralResultCheckerTestCase(unittest.TestCase):
         config = copy.deepcopy(self.checker_cfg)
         config['condition'] = 'wrong'
         ins = result_checker_general.GeneralResultChecker(config,
-            self.context);
-        mock_ssh.SSH().execute.return_value = (0, "1", '')
+                                                          self.context)
+        mock_ssh.SSH.from_node().execute.return_value = (0, "1", '')
         ins.setup()
         self.assertFalse(ins.verify())
 
@@ -108,7 +110,7 @@ class GeneralResultCheckerTestCase(unittest.TestCase):
         config = copy.deepcopy(self.checker_cfg)
         config.pop('parameter')
         ins = result_checker_general.GeneralResultChecker(config,
-            self.context);
-        mock_ssh.SSH().execute.return_value = (1, "fail", '')
+                                                          self.context)
+        mock_ssh.SSH.from_node().execute.return_value = (1, "fail", '')
         ins.setup()
-        ins.verify()
\ No newline at end of file
+        ins.verify()