summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2016-12-20 10:46:26 +0800
committerJingLu5 <lvjing5@huawei.com>2016-12-20 11:08:02 +0800
commitdcc1818e66580808de9e427812a1c82f7e0673ff (patch)
tree178272dce574ef842aba41ac4a95fbe2b9b86366
parent367691281be05a5f2c76455465ff14078415e6c2 (diff)
BugFix: remotepath cannot be found
JIRA: YARDSTICK-501 An redundant pair of quotation in ssh.py causes remotepath cannot be found. Change-Id: I2df8ab59830fd28d8ad8882a93a8efbd4d1f7cb7 Signed-off-by: JingLu5 <lvjing5@huawei.com>
-rw-r--r--tests/unit/test_ssh.py2
-rw-r--r--yardstick/ssh.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit/test_ssh.py b/tests/unit/test_ssh.py
index 88638a0a8..8b828ed7c 100644
--- a/tests/unit/test_ssh.py
+++ b/tests/unit/test_ssh.py
@@ -314,7 +314,7 @@ class SSHRunTestCase(unittest.TestCase):
self.test_client._put_file_shell("localfile", "remotefile", 0o42)
self.test_client.run.assert_called_once_with(
- 'cat > "remotefile"&& chmod -- 042 "remotefile"',
+ 'cat > remotefile && chmod -- 042 remotefile',
stdin=mock_open.return_value.__enter__.return_value)
@mock.patch("yardstick.ssh.os.stat")
diff --git a/yardstick/ssh.py b/yardstick/ssh.py
index 2ba6de92e..3081001b6 100644
--- a/yardstick/ssh.py
+++ b/yardstick/ssh.py
@@ -313,14 +313,14 @@ class SSH(object):
def _put_file_shell(self, localpath, remotepath, mode=None):
# quote to stop wordpslit
- cmd = ['cat > "%s"' % remotepath]
+ cmd = ['cat > %s' % remotepath]
if mode is not None:
# use -- so no options
- cmd.append('chmod -- 0%o "%s"' % (mode, remotepath))
+ cmd.append('chmod -- 0%o %s' % (mode, remotepath))
with open(localpath, "rb") as localfile:
# only chmod on successful cat
- cmd = "&& ".join(cmd)
+ cmd = " && ".join(cmd)
self.run(cmd, stdin=localfile)
def put_file(self, localpath, remotepath, mode=None):