Merge "standardize ssh auth"

[yardstick.git] / tests / unit / benchmark / core / test_plugin.py

diff --git a/tests/unit/benchmark/core/test_plugin.py b/tests/unit/benchmark/core/test_plugin.py
index 441116a..f9c0761 100644 (file)
--- a/tests/unit/benchmark/core/test_plugin.py
+++ b/tests/unit/benchmark/core/test_plugin.py
@@ -10,16 +10,27 @@
 ##############################################################################
 
 # Unittest for yardstick.benchmark.core.plugin
-
-import mock
+from __future__ import absolute_import
+import os
+from os.path import dirname as dirname
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest
 
 from yardstick.benchmark.core import plugin
 
 
 class Arg(object):
+
     def __init__(self):
-        self.input_file = ('plugin/sample_config.yaml',)
+        # self.input_file = ('plugin/sample_config.yaml',)
+        self.input_file = [
+            os.path.join(os.path.abspath(
+                dirname(dirname(dirname(dirname(dirname(__file__)))))),
+                'plugin/sample_config.yaml')]
 
 
 @mock.patch('yardstick.benchmark.core.plugin.ssh')
@@ -30,7 +41,7 @@ class pluginTestCase(unittest.TestCase):
 
     def test_install(self, mock_ssh):
         p = plugin.Plugin()
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         input_file = Arg()
         p.install(input_file)
         expected_result = {}
@@ -38,7 +49,7 @@ class pluginTestCase(unittest.TestCase):
 
     def test_remove(self, mock_ssh):
         p = plugin.Plugin()
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         input_file = Arg()
         p.remove(input_file)
         expected_result = {}
@@ -46,7 +57,7 @@ class pluginTestCase(unittest.TestCase):
 
     def test_install_setup_run(self, mock_ssh):
         p = plugin.Plugin()
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         plugins = {
             "name": "sample"
         }
@@ -65,7 +76,7 @@ class pluginTestCase(unittest.TestCase):
 
     def test_remove_setup_run(self, mock_ssh):
         p = plugin.Plugin()
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
         plugins = {
             "name": "sample"
         }