Merge branch 'master' into jv-gen-server-exits

4 files changed, 77 insertions, 9 deletions

diff --git a/lib/common_test/doc/src/ct_ssh.xml b/lib/common_test/doc/src/ct_ssh.xml
index 137e4c3f1d..63627d8840 100644
--- a/lib/common_test/doc/src/ct_ssh.xml
+++ b/lib/common_test/doc/src/ct_ssh.xml
@@ -1034,6 +1034,33 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
+      <name>shell(SSH, ChannelId) -&gt; ok | {error, Reason}</name>
+      <fsummary>Equivalent to shell(SSH, ChannelId, DefaultTimeout).</fsummary>
+      <desc><marker id="shell-2"/>
+        <p>Equivalent to
+          <seealso marker="#shell-3"><c>ct_ssh:shell(SSH, ChannelId,
+            DefaultTimeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>shell(SSH, ChannelId, Timeout) -&gt; ok | {error, Reason}</name>
+      <fsummary>Requests that the user default shell is executed at the
+        server end.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>ChannelId = integer()</v>
+        <v>Timeout = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="shell-3"/>
+        <p>Requests that the user default shell (typically defined in
+          <c>/etc/passwd</c> in Unix systems) is executed at the
+          server end.</p>
+      </desc>
+    </func>
+
+    <func>
       <name>subsystem(SSH, ChannelId, Subsystem) -&gt; Status | {error, Reason}</name>
       <fsummary>Equivalent to subsystem(SSH, ChannelId, Subsystem,
         DefaultTimeout).</fsummary>
diff --git a/lib/common_test/src/ct_ssh.erl b/lib/common_test/src/ct_ssh.erl
index 6ab3bf036c..5ac91f396b 100644
--- a/lib/common_test/src/ct_ssh.erl
+++ b/lib/common_test/src/ct_ssh.erl
@@ -68,7 +68,8 @@
  	 send_and_receive/3, send_and_receive/4, send_and_receive/5,
 	 send_and_receive/6,
  	 exec/2, exec/3, exec/4,
- 	 subsystem/3, subsystem/4]).
+         subsystem/3, subsystem/4,
+         shell/2, shell/3]).
 
 %% STFP Functions
 -export([sftp_connect/1, 
@@ -94,6 +95,7 @@
 
 -record(state, {ssh_ref, conn_type, target}).
 
+-type handle() :: pid().
 
 %%%-----------------------------------------------------------------
 %%%------------------------ SSH COMMANDS ---------------------------
@@ -490,6 +492,22 @@ subsystem(SSH, ChannelId, Subsystem, Timeout) ->
     call(SSH, {subsystem,ChannelId,Subsystem,Timeout}).
 
 
+-spec shell(SSH, ChannelId) -> Result when
+      SSH :: handle() | ct:target_name(),
+      ChannelId :: ssh:ssh_channel_id(),
+      Result :: ok | {error,term()}.
+shell(SSH, ChannelId) ->
+    shell(SSH, ChannelId, ?DEFAULT_TIMEOUT).
+
+-spec shell(SSH, ChannelId, Timeout) -> Result when
+      SSH :: handle() | ct:target_name(),
+      ChannelId :: ssh:ssh_channel_id(),
+      Timeout :: timeout(),
+      Result :: ok | {error,term()}.
+shell(SSH, ChannelId, Timeout) ->
+    call(SSH, {shell,ChannelId,Timeout}).
+
+
 %%%-----------------------------------------------------------------
 %%%------------------------ SFTP COMMANDS --------------------------
 
@@ -1067,6 +1085,14 @@ handle_msg({subsystem,Chn,Subsystem,TO}, State) ->
     Result = ssh_connection:subsystem(SSHRef, Chn, Subsystem, TO),
     {Result,State};
 
+handle_msg({shell,Chn,TO}, State) ->
+    #state{ssh_ref=SSHRef, target=Target} = State,
+    try_log(heading(shell,Target),
+	    "SSH Ref: ~p, Chn: ~p, Timeout: ~p",
+            [SSHRef,Chn,TO]),
+    Result = ssh_connection:shell(SSHRef, Chn),
+    {Result,State};
+
 %% --- SFTP Commands ---
 
 handle_msg({read_file,Srv,File}=Cmd, S=#state{ssh_ref=SSHRef}) ->
diff --git a/lib/common_test/test/ct_keep_logs_SUITE.erl b/lib/common_test/test/ct_keep_logs_SUITE.erl
index f0c85a88a2..6b7aaa57ac 100644
--- a/lib/common_test/test/ct_keep_logs_SUITE.erl
+++ b/lib/common_test/test/ct_keep_logs_SUITE.erl
@@ -70,8 +70,7 @@ keep_logs(Config) ->
     Opts = [{suite,Suite},{label,keep_logs} | Opts0],
 
     LogDir=?config(logdir,Opts),
-    KeepLogsDir = filename:join(LogDir,unique_name("keep_logs-")),
-    ok = file:make_dir(KeepLogsDir),
+    KeepLogsDir = create_dir(filename:join(LogDir,"keep_logs-")),
     Opts1 = lists:keyreplace(logdir,1,Opts,{logdir,KeepLogsDir}),
     ct:log("New LogDir = ~s", [KeepLogsDir]),
 
@@ -121,7 +120,11 @@ keep_logs(Config) ->
     9 = length(L10),
     0 = ct_test_support:run_ct_script_start([{keep_logs,10}|Opts1], Config),
     L11 = filelib:wildcard(WC),
-    10 = length(L11).
+    10 = length(L11),
+
+    {ok,Content} = file:list_dir(KeepLogsDir),
+    ct:log("Deleting dir: ~p~nContent: ~p~n",[KeepLogsDir,Content]),
+    ct_test_support:rm_dir(KeepLogsDir).
 
 %% Test the keep_logs option togwther with the refresh_logs option
 refresh_logs(Config) ->
@@ -129,8 +132,7 @@ refresh_logs(Config) ->
     Suite = filename:join(DataDir, "keep_logs_SUITE"),
     Opts0 = ct_test_support:get_opts(Config),
     LogDir=?config(logdir,Opts0),
-    KeepLogsDir = filename:join(LogDir,unique_name("refresh_logs-")),
-    ok = file:make_dir(KeepLogsDir),
+    KeepLogsDir = create_dir(filename:join(LogDir,"refresh_logs-")),
     Opts1 = lists:keyreplace(logdir,1,Opts0,{logdir,KeepLogsDir}),
     ct:log("New LogDir = ~s", [KeepLogsDir]),
 
@@ -178,9 +180,20 @@ refresh_logs(Config) ->
     L10 = filelib:wildcard(WC),
     4 = length(L10),
 
-    ok.
+    {ok,Content} = file:list_dir(KeepLogsDir),
+    ct:log("Deleting dir: ~p~nContent: ~p~n",[KeepLogsDir,Content]),
+    ct_test_support:rm_dir(KeepLogsDir).
+
 %%%-----------------------------------------------------------------
 %%% Internal
-unique_name(Prefix) ->
+create_dir(Prefix) ->
     I = erlang:unique_integer([positive]),
-    Prefix ++ integer_to_list(I).
+    Dir = Prefix ++ integer_to_list(I),
+    case filelib:is_dir(Dir) of
+        true ->
+            %% Try again
+            create_dir(Prefix);
+        false ->
+            ok = file:make_dir(Dir),
+            Dir
+    end.
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 935d032667..ba7aadfeec 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -45,6 +45,8 @@
 
 -export([unique_timestamp/0]).
 
+-export([rm_dir/1]).
+
 -include_lib("kernel/include/file.hrl").
 
 %%%-----------------------------------------------------------------