diff options
| author |   Kubi <jean.gaoliang@huawei.com> | 2017-01-19 08:27:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-19 08:27:31 +0000 |
| commit | a3c1072104d87ad8ba31734d4042f57e531ae9d9 (patch) | |
| tree | ea09bfefec303529822d7f4d4d22a7846f17934f | |
| parent | a74d4dc8d5717fbd1a14c69853c1377fc6912f10 (diff) | |
| parent | 0aa65ecf94ecbab93fa858607f1051535ac2d59e (diff) | |
Merge "Verify stdin data before doing encodeutils safe_encode"
| -rw-r--r-- | yardstick/ssh.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/yardstick/ssh.py b/yardstick/ssh.py index 1cad8eefa..cfbc3ca96 100644 --- a/yardstick/ssh.py +++ b/yardstick/ssh.py @@ -202,7 +202,7 @@ class SSH(object): start_time = time.time() # encode on transmit, decode on receive - data_to_send = encodeutils.safe_encode("") + data_to_send = encodeutils.safe_encode("", incoming='utf-8') stderr_data = None # If we have data to be sent to stdin then `select' should also @@ -234,8 +234,11 @@ class SSH(object): if session.send_ready(): if stdin is not None and not stdin.closed: if not data_to_send: + stdin_txt = stdin.read(4096) + if stdin_txt is None: + stdin_txt = '' data_to_send = encodeutils.safe_encode( - stdin.read(4096), incoming='utf-8') + stdin_txt, incoming='utf-8') if not data_to_send: # we may need to keep stdin open if not keep_stdin_open: |