svn commit: r1143923 - /libcloud/trunk/test/compute/test_deployment.py

[tomaz]

Author: tomaz
Date: Thu Jul  7 17:07:16 2011
New Revision: 1143923

URL: http://svn.apache.org/viewvc?rev=1143923&view=rev
Log:
Always mock have_paramiko variable so the tests work properly even if the
paramiko library is not installed.

Modified:
    libcloud/trunk/test/compute/test_deployment.py

Modified: libcloud/trunk/test/compute/test_deployment.py
URL: 
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_deployment.py?rev=1143923&r1=1143922&r2=1143923&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_deployment.py (original)
+++ libcloud/trunk/test/compute/test_deployment.py Thu Jul  7 17:07:16 2011
@@ -215,9 +215,11 @@ class DeploymentTests(unittest.TestCase)
             self.fail('Exception was not thrown')
 
     @patch('libcloud.compute.base.SSHClient')
-    def test_deploy_node_success(self, _):
+    @patch('libcloud.compute.ssh')
+    def test_deploy_node_success(self, mock_ssh_module, _):
         self.driver.create_node = Mock()
         self.driver.create_node.return_value = self.node
+        mock_ssh_module.have_paramiko = True
 
         deploy = Mock()
 
@@ -225,9 +227,12 @@ class DeploymentTests(unittest.TestCase)
         self.assertEqual(self.node.id, node.id)
 
     @patch('libcloud.compute.base.SSHClient')
-    def test_deploy_node_exception_run_deployment_script(self, _):
+    @patch('libcloud.compute.ssh')
+    def test_deploy_node_exception_run_deployment_script(self, mock_ssh_module,
+                                                         _):
         self.driver.create_node = Mock()
         self.driver.create_node.return_value = self.node
+        mock_ssh_module.have_paramiko = True
 
         deploy = Mock()
         deploy.run = Mock()
@@ -241,10 +246,14 @@ class DeploymentTests(unittest.TestCase)
             self.fail('Exception was not thrown')
 
     @patch('libcloud.compute.base.SSHClient')
-    def test_deploy_node_exception_ssh_client_connect(self, ssh_client):
+    @patch('libcloud.compute.ssh')
+    def test_deploy_node_exception_ssh_client_connect(self, mock_ssh_module,
+                                                      ssh_client):
         self.driver.create_node = Mock()
         self.driver.create_node.return_value = self.node
 
+        mock_ssh_module.have_paramiko = True
+
         deploy = Mock()
         ssh_client.side_effect = IOError('bar')
 
@@ -255,8 +264,10 @@ class DeploymentTests(unittest.TestCase)
         else:
             self.fail('Exception was not thrown')
 
-    def test_deploy_node_depoy_node_not_implemented(self):
+    @patch('libcloud.compute.ssh')
+    def test_deploy_node_depoy_node_not_implemented(self, mock_ssh_module):
         self.driver.features = {'create_node': []}
+        mock_ssh_module.have_paramiko = True
 
         try:
             self.driver.deploy_node(deploy=Mock())
@@ -275,8 +286,10 @@ class DeploymentTests(unittest.TestCase)
             self.fail('Exception was not thrown')
 
     @patch('libcloud.compute.base.SSHClient')
-    def test_deploy_node_password_auth(self, _):
+    @patch('libcloud.compute.ssh')
+    def test_deploy_node_password_auth(self, mock_ssh_module, _):
         self.driver.features = {'create_node': ['password']}
+        mock_ssh_module.have_paramiko = True
 
         self.driver.create_node = Mock()
         self.driver.create_node.return_value = self.node