Merge branch 'fredrik/ct/telnet_testcases' into maint

* fredrik/ct/telnet_testcases:
  Added testcases for ct_telnet and opportunity to connect to telnet without user and password.

4 files changed, 233 insertions, 6 deletions

diff --git a/lib/common_test/src/unix_telnet.erl b/lib/common_test/src/unix_telnet.erl
index 99ce92e9f1..71df2ab44e 100644
--- a/lib/common_test/src/unix_telnet.erl
+++ b/lib/common_test/src/unix_telnet.erl
@@ -94,11 +94,16 @@ connect(Ip,Port,Timeout,KeepAlive,Extra) ->
 	{Username,Password} -> 
 	    connect1(Ip,Port,Timeout,KeepAlive,Username,Password);
 	Name ->
-	    case get_username_and_password(Name) of
-		{ok,{Username,Password}} -> 
-		    connect1(Ip,Port,Timeout,KeepAlive,Username,Password);
-		Error -> 
-		    Error
+	    case not_require_user_and_pass(Name) of
+		true ->
+		    connect_without_username_and_pass(Ip,Port,Timeout,KeepAlive);
+		_ ->
+		    case get_username_and_password(Name) of
+			{ok,{Username,Password}} -> 
+			    connect1(Ip,Port,Timeout,KeepAlive,Username,Password);
+			Error -> 
+			    Error
+		    end
 	    end
     end.
 
@@ -144,6 +149,27 @@ connect1(Ip,Port,Timeout,KeepAlive,Username,Password) ->
     end_log(),
     Result.
 
+connect_without_username_and_pass(Ip,Port,Timeout,KeepAlive) ->
+    start_log("unix_telnet:connect"),
+    Result = 
+	case ct_telnet_client:open(Ip,Port,Timeout,KeepAlive) of
+	    {ok,Pid} ->
+		{ok, Pid};
+	    Error ->
+		cont_log("Could not open telnet connection\n~p\n",[Error]),
+		Error
+	end,
+    end_log(),
+    Result.
+
+not_require_user_and_pass(Name) ->
+    case ct:get_config({Name, not_require_user_and_pass}) of
+	undefined ->
+	    false;
+	_ ->
+	    true
+    end.
+
 get_username_and_password(Name) ->
     case ct:get_config({Name,username}) of
 	undefined ->
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index bd746f87a7..a9ebd8f1d3 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -58,7 +58,8 @@ MODULES= \
 	ct_group_leader_SUITE \
 	ct_cover_SUITE \
 	ct_groups_search_SUITE \
-	ct_surefire_SUITE
+	ct_surefire_SUITE \
+	ct_telnet_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
diff --git a/lib/common_test/test/ct_telnet_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE.erl
new file mode 100644
index 0000000000..b4f24baa0c
--- /dev/null
+++ b/lib/common_test/test/ct_telnet_SUITE.erl
@@ -0,0 +1,122 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_telnet_SUITE
+%%%
+%%% Description:
+%%% Edit your ts.unix.config or ts.win32.config before runnings these tests
+%%% Test ct_telnet_SUITE module
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_telnet_SUITE).
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    ct_test_support:init_per_suite(Config).
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     default
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+default(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "ct_telnet_basic_SUITE"),
+    Cfg = {unix, ct:get_config(unix)},
+    ok = file:write_file(filename:join(DataDir, "telnet.cfg"), io_lib:write(Cfg) ++ "."),
+    CfgFile = filename:join(DataDir, "telnet.cfg"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,default}, {config, CfgFile}], Config),
+    ok = execute(default, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Name,Config),
+    ct_test_support:verify_events(TestEvents, Events, Config).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(default,Config) ->
+    {module,_} = code:load_abs(filename:join(?config(data_dir,Config),
+					     ct_telnet_basic_SUITE)),
+    TCs = ct_telnet_basic_SUITE:all(),
+    code:purge(ct_telnet_basic_SUITE),
+    code:delete(ct_telnet_basic_SUITE),
+
+    OneTest =
+	[{?eh,start_logging,{'DEF','RUNDIR'}}] ++
+	[{?eh,tc_done,{ct_telnet_basic_SUITE,TC,ok}} || TC <- TCs] ++
+	[{?eh,stop_logging,[]}],
+
+    %% 2 tests (ct:run_test + script_start) is default
+    OneTest ++ OneTest.
diff --git a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_basic_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_basic_SUITE.erl
new file mode 100644
index 0000000000..914b95f9cf
--- /dev/null
+++ b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_basic_SUITE.erl
@@ -0,0 +1,78 @@
+%% Modify your ts.unix.config or ts.win32.config file before running these tests
+-module(ct_telnet_basic_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+
+suite() -> [{require,telnet_temp,{unix,[telnet]}}].
+
+all() -> 
+    [start_stop, send_and_get, expect, already_closed, 
+     cmd, sendf, close_wrong_type].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+start_stop(_Config) ->
+    {ok, Handle} = ct_telnet:open(telnet_temp),
+    ok = ct_telnet:close(Handle),
+    ok.
+send_and_get(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_temp),
+    ok = ct_telnet:send(Handle, "ayt"),
+    {ok, _Data} = ct_telnet:get_data(Handle),
+    ok = ct_telnet:close(Handle),
+    ok.
+    
+expect(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_temp),
+    ok = ct_telnet:send(Handle, "echo ayt"),
+    ok = case ct_telnet:expect(Handle, ["ayt"]) of
+	     {ok, _} ->
+		 ok;
+	     {error, {prompt, _}} ->
+		 ok
+	 end,
+    ok = ct_telnet:close(Handle),
+    ok.
+
+already_closed(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_temp),
+    ok = ct_telnet:close(Handle),
+    {error, already_closed} = ct_telnet:close(Handle),
+    ok.
+
+cmd(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_temp),
+    {ok, _} = ct_telnet:cmd(Handle, "display"),
+    {ok, _} = ct_telnet:cmdf(Handle, "~s ~s", ["set", "bsasdel"]),
+    ok = ct_telnet:close(Handle),
+    ok.
+
+sendf(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_temp),
+    ok = ct_telnet:sendf(Handle, "~s", ["ayt"]),
+    ok = ct_telnet:close(Handle),
+    ok.
+
+close_wrong_type(_) ->
+    {error, _} = ct_telnet:close(whatever),
+    ok.