diff options
author | Henrik Nord <[email protected]> | 2014-12-02 10:39:40 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2014-12-02 10:39:40 +0100 |
commit | 506a78a32112e64d8cc328e461fc588a07c3b8b4 (patch) | |
tree | 7a83755885bbe7d48b1275f8320a7cd9985027f6 /lib/common_test/src/ct_netconfc.erl | |
parent | 079ffcc3f7fa3de171e472eb32eee07280b82ccc (diff) | |
parent | 6852931e4460ad44aaa8d97bafdb4df3b2a5fee2 (diff) | |
download | otp-506a78a32112e64d8cc328e461fc588a07c3b8b4.tar.gz otp-506a78a32112e64d8cc328e461fc588a07c3b8b4.tar.bz2 otp-506a78a32112e64d8cc328e461fc588a07c3b8b4.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_netconfc.erl')
-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 2f66c7613c..14ee55703f 100644 --- a/lib/common_test/src/ct_netconfc.erl +++ b/lib/common_test/src/ct_netconfc.erl @@ -1895,7 +1895,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), |