diff options
| -rw-r--r-- | tests/unit/test_ssh.py | 2 | ||||
| -rw-r--r-- | yardstick/ssh.py | 6 |
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): |