aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-08-27 10:53:01 +0200
committerFredrik Gustafsson <[email protected]>2012-08-27 10:53:01 +0200
commit42b1d8a16e3f43f093e5928cb5b09abdc204827a (patch)
tree3c5ad7d645a7a2f2faaa2d0858e6d28df61719a3 /lib
parentb57bbdb05383928505b96939df2cac81d7a6d661 (diff)
parenta33b8c3f1ff1ddcc9dca9b1da955a9cda5136636 (diff)
downloadotp-42b1d8a16e3f43f093e5928cb5b09abdc204827a.tar.gz
otp-42b1d8a16e3f43f093e5928cb5b09abdc204827a.tar.bz2
otp-42b1d8a16e3f43f093e5928cb5b09abdc204827a.zip
Merge branch 'kr/r15_ssh_test_ipv6_fix/OTP-10219' into maint
* kr/r15_ssh_test_ipv6_fix/OTP-10219: Fix lib/src/test/ssh_basic_SUITE.erl to fix IPv6 option typos
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/test/ssh_basic_SUITE.erl8
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),