aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-12-02 10:39:19 +0100
committerHenrik Nord <[email protected]>2014-12-02 10:39:19 +0100
commit6852931e4460ad44aaa8d97bafdb4df3b2a5fee2 (patch)
tree36f62c99cc56fea42d30db20106bc258409e47b1 /lib
parentbf86161c2366936457139293fe7c326dd830b62b (diff)
parentfc3cbc1fc709e367470e80f46da68738ce980800 (diff)
downloadotp-6852931e4460ad44aaa8d97bafdb4df3b2a5fee2.tar.gz
otp-6852931e4460ad44aaa8d97bafdb4df3b2a5fee2.tar.bz2
otp-6852931e4460ad44aaa8d97bafdb4df3b2a5fee2.zip
Merge branch 'siri/ct_netconfc/subsystem-timeout/OTP-12334' into maint
* siri/ct_netconfc/subsystem-timeout/OTP-12334: [ct_netconfc] Handle timeout failure in ssh
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct_netconfc.erl4
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),