From fc3cbc1fc709e367470e80f46da68738ce980800 Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Thu, 27 Nov 2014 13:27:10 +0100 Subject: [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. --- lib/common_test/src/ct_netconfc.erl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/common_test') 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), -- cgit v1.2.3