heat tests : remove pointless get_ssh_client

get_ssh_client() doesn't actually do anything, so just reference the
attribute directly

Change-Id: I6a88b09953a7ca5a0e2675ac1c2c5a99b8cf724a
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/heat/tests/functional/test_WordPress_With_RDS.py b/heat/tests/functional/test_WordPress_With_RDS.py
index 384a88e68a4bdc6d50346cdeeb68c6b0fe996c04..7c66ef8fd55613dffc1c95641e9fa1c24e325898 100644 (file)
--- a/heat/tests/functional/test_WordPress_With_RDS.py
+++ b/heat/tests/functional/test_WordPress_With_RDS.py
@@ -63,8 +63,7 @@ class WordPressRDSFunctionalTest(unittest.TestCase):
         # IP into the /usr/share one, which seems to work but could be a
         # template bug..
         stdin, stdout, sterr =\
-            self.WebServer.get_ssh_client().exec_command('grep DB_HOST '
-                                                         + wp_file)
+            self.WebServer.ssh.exec_command('grep DB_HOST ' + wp_file)
         result = stdout.readlines().pop().rstrip().split('\'')
         print "Checking wordpress DB_HOST, got %s" % result[3]
         self.assertTrue("localhost" != result[3])

diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py
index d2fcb5a9f3ef9e1239a4140242da409e1c08b51f..c8f935bc7a88e24f0c5d5f34fb06c245ebfe0cd0 100644 (file)
--- a/heat/tests/functional/util.py
+++ b/heat/tests/functional/util.py
@@ -296,11 +296,6 @@ class Instance(object):
                 with open(filepaths[file]) as f:
                     self.testcase.assertEqual(data, f.read())
 
-    def get_ssh_client(self):
-        if self.ssh.get_transport() is not None:
-            return self.ssh
-        return None
-
     def get_sftp_client(self):
         if self.sftp is not None:
             return self.sftp