From: Steven Hardy Date: Fri, 4 Jan 2013 15:20:43 +0000 (+0000) Subject: heat tests : remove pointless get_ssh_client X-Git-Tag: 2014.1~1026^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=57a75dddff5a2c8cac3efd2fae507c85e022b9fc;p=openstack-build%2Fheat-build.git 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 --- diff --git a/heat/tests/functional/test_WordPress_With_RDS.py b/heat/tests/functional/test_WordPress_With_RDS.py index 384a88e6..7c66ef8f 100644 --- 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 d2fcb5a9..c8f935bc 100644 --- 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