aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-27 12:01:58 +0200
committerPeter Andersson <[email protected]>2012-08-27 12:01:58 +0200
commitab24f85be4a730cb5c5d85ba6e57a53b503a8e03 (patch)
tree5a06d3ddf24fecf72b935a770144f48f65dbc391 /lib/common_test/test
parent0ff106bd0fa654c09144102ca5baf73bb1d3a459 (diff)
parent1c6c751aa5eb6ae958354d6839c5f2401854337c (diff)
downloadotp-ab24f85be4a730cb5c5d85ba6e57a53b503a8e03.tar.gz
otp-ab24f85be4a730cb5c5d85ba6e57a53b503a8e03.tar.bz2
otp-ab24f85be4a730cb5c5d85ba6e57a53b503a8e03.zip
Merge remote branch 'origin/peppe/common_test/silent_connection_testspec' into maint
* origin/peppe/common_test/silent_connection_testspec: Add silent_connections term to test specification
Diffstat (limited to 'lib/common_test/test')
-rw-r--r--lib/common_test/test/ct_testspec_2_SUITE.erl8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/common_test/test/ct_testspec_2_SUITE.erl b/lib/common_test/test/ct_testspec_2_SUITE.erl
index 93f3520f95..681387c745 100644
--- a/lib/common_test/test/ct_testspec_2_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_2_SUITE.erl
@@ -79,6 +79,10 @@ all() ->
%% {logopts,3}
%% {basic_html,2}
%% {basic_html,3}
+%% {verbosity,2}
+%% {verbosity,3}
+%% {silent_connections,2}
+%% {silent_connections,3}
%% {label,2}
%% {label,3}
%% {event_handler,2}
@@ -533,6 +537,9 @@ misc_config_terms(_Config) ->
{basic_html,n1@h1,false},
{basic_html,n2@h2,true},
+ {silent_connections,n1@h1,all},
+ {silent_connections,n2@h2,[ssh]},
+
{enable_builtin_hooks,false},
{noinput,true},
@@ -571,6 +578,7 @@ misc_config_terms(_Config) ->
Verify = #testspec{spec_dir = SpecDir,
nodes = [{undefined,Node},{x,n1@h1},{y,n2@h2}],
basic_html = [{Node,true},{n1@h1,false},{n2@h2,true}],
+ silent_connections = [{n1@h1,[all]},{n2@h2,[ssh]}],
config = [{Node,CfgA},
{n1@h1,CfgA},
{n2@h2,CfgA},