diff options
| author | Siri Hansen <[email protected]> | 2014-11-27 13:27:10 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-11-27 13:27:10 +0100 |
| commit | fc3cbc1fc709e367470e80f46da68738ce980800 (patch) | |
| tree | 5971d60bf7c43728de92fbbf7cd5a6a288d4d6a7 | |
| parent | fc2067dc316e66e07c351254fbfb4a7edbaf6be4 (diff) | |
| download | otp-fc3cbc1fc709e367470e80f46da68738ce980800.tar.gz otp-fc3cbc1fc709e367470e80f46da68738ce980800.tar.bz2 otp-fc3cbc1fc709e367470e80f46da68738ce980800.zip | |
[ct_netconfc] Handle timeout failure in ssh
ssh_connection:subsystem/4 can return success | failure |
{error,timeout}. The latter was not handled by ct_netconfc.erl. This
is now corrected.
| -rw-r--r-- | lib/common_test/src/ct_netconfc.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl index a3861dc745..bded5a15cb 100644 --- a/lib/common_test/src/ct_netconfc.erl +++ b/lib/common_test/src/ct_netconfc.erl @@ -1858,7 +1858,9 @@ ssh_open(#options{host=Host,timeout=Timeout,port=Port,ssh=SshOpts,name=Name}) -> name = Name}}; failure -> ssh:close(CM), - {error,{ssh,could_not_execute_netconf_subsystem}} + {error,{ssh,could_not_execute_netconf_subsystem}}; + {error,timeout} -> + {error,{ssh,could_not_execute_netconf_subsystem,timeout}} end; {error, Reason} -> ssh:close(CM), |