diff options
| author | Peter Andersson <[email protected]> | 2012-08-27 12:00:24 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-27 12:00:24 +0200 |
| commit | 0ff106bd0fa654c09144102ca5baf73bb1d3a459 (patch) | |
| tree | b8d4dfb7b689823a28353b5ad41f0302360ed281 /lib/ssh/test/ssh_basic_SUITE.erl | |
| parent | ae2c50f36806b26530de88d2609cd6ced018cb54 (diff) | |
| parent | fd7423d3fc1a32e497084d5c70e2d05792032925 (diff) | |
| download | otp-0ff106bd0fa654c09144102ca5baf73bb1d3a459.tar.gz otp-0ff106bd0fa654c09144102ca5baf73bb1d3a459.tar.bz2 otp-0ff106bd0fa654c09144102ca5baf73bb1d3a459.zip | |
Merge remote branch 'upstream/maint' into maint
Diffstat (limited to 'lib/ssh/test/ssh_basic_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl index c5019425cd..2ceaa9daa5 100644 --- a/lib/ssh/test/ssh_basic_SUITE.erl +++ b/lib/ssh/test/ssh_basic_SUITE.erl @@ -194,10 +194,10 @@ misc_ssh_options(Config) when is_list(Config) -> SystemDir = filename:join(?config(priv_dir, Config), system), UserDir = ?config(priv_dir, Config), - CMiscOpt0 = [{connecect_timeout, 1000}, {ip_v6_disable, false}, {user_dir, UserDir}], - CMiscOpt1 = [{connecect_timeout, infinity}, {ip_v6_disable, true}, {user_dir, UserDir}], - SMiscOpt0 = [{ip_v6_disable, false}, {user_dir, UserDir}, {system_dir, SystemDir}], - SMiscOpt1 = [{ip_v6_disable, true}, {user_dir, UserDir}, {system_dir, SystemDir}], + CMiscOpt0 = [{connecect_timeout, 1000}, {ip_v6_disabled, false}, {user_dir, UserDir}], + CMiscOpt1 = [{connecect_timeout, infinity}, {ip_v6_disabled, true}, {user_dir, UserDir}], + SMiscOpt0 = [{ip_v6_disabled, false}, {user_dir, UserDir}, {system_dir, SystemDir}], + SMiscOpt1 = [{ip_v6_disabled, true}, {user_dir, UserDir}, {system_dir, SystemDir}], ClientOpts = ?config(client_opts, Config), ServerOpts = ?config(server_opts, Config), |