diff options
author | Alex Yang <yangyang1@zte.com.cn> | 2017-08-14 23:47:37 +0800 |
---|---|---|
committer | Alex Yang <yangyang1@zte.com.cn> | 2017-08-14 23:47:37 +0800 |
commit | acc4428e76422ad5c60f5433f325258214e6bc3b (patch) | |
tree | 386e8a88340431f038f9d9abb7e622819c2b896a | |
parent | 9c023d8d1c85650b33e6375d58cd1b45c8d0d395 (diff) |
Fix validate_ssh_client
After the "try..finally.." statement is executed, the ssh_client is
closed by the "finally" statement. So the out.channel.in_buffer is
not readable and the testcases failed.
Change-Id: I3fbf620cb9ccee62c515b83fed9fd01238ad3262
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
-rw-r--r-- | snaps/openstack/tests/create_instance_tests.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index 1ef96fd..19173d2 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -1766,18 +1766,17 @@ def validate_ssh_client(instance_creator): if ssh_client: try: out = ssh_client.exec_command('pwd')[1] + channel = out.channel + in_buffer = channel.in_buffer + pwd_out = in_buffer.read(1024) + if not pwd_out or len(pwd_out) < 10: + return False + return True finally: ssh_client.close() else: return False - channel = out.channel - in_buffer = channel.in_buffer - pwd_out = in_buffer.read(1024) - if not pwd_out or len(pwd_out) < 10: - return False - return True - return False |