Merge branch 'peppe/ct_misc_18_patches' into maint-18

* peppe/ct_misc_18_patches:
  Add flag/option for disabling the character escaping functionality
  Fix bug using the wrong lists search function
  Fix bug with clashing timestamp values
  Fix problem with stylesheet tags getting escaped
  Skip pre/post test IO suite if cover or debug is running
  Tweak pre_post_io test case to run without failing
  Fix various log related problems

6 files changed, 165 insertions, 90 deletions

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
index 9a924a66ac..5e4df0b3c2 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
 %% You may obtain a copy of the License at
@@ -14,46 +14,46 @@
 %% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
-%%

-%% %CopyrightEnd%

-%%

-

--module(ct_update_config_SUITE).

-

--suite_defaults([{timetrap, {minutes, 10}}]).

-

-%% Note: This directive should only be used in test suites.

--compile(export_all).

-

--include("ct.hrl").

-

--define(now, os:timestamp()).

-

-%% Test server callback functions

-init_per_suite(Config) ->

-    [{init_per_suite,?now}|Config].

-

-end_per_suite(_Config) ->

-    ok.

-

-init_per_testcase(_TestCase, Config) ->

-    [{init_per_testcase,?now}|Config].

-

-end_per_testcase(_TestCase, _Config) ->

-    ok.

-

-init_per_group(GroupName, Config) ->

-    [{init_per_group,?now}|Config].

-

-end_per_group(GroupName, Config) ->

-    ok.

-

-all() ->

-    [{group,group1}].

-

-groups() ->

-    [{group1,[],[test_case]}].

-    

-%% Test cases starts here.

-test_case(Config) when is_list(Config) ->

-    ok.

+%%
+%% %CopyrightEnd%
+%%
+
+-module(ct_update_config_SUITE).
+
+-suite_defaults([{timetrap, {minutes, 10}}]).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("ct.hrl").
+
+-define(now, ct_test_support:unique_timestamp()).
+
+%% Test server callback functions
+init_per_suite(Config) ->
+    [{init_per_suite,?now}|Config].
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    [{init_per_testcase,?now}|Config].
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+init_per_group(GroupName, Config) ->
+    [{init_per_group,?now}|Config].
+
+end_per_group(GroupName, Config) ->
+    ok.
+
+all() ->
+    [{group,group1}].
+
+groups() ->
+    [{group1,[],[test_case]}].
+    
+%% Test cases starts here.
+test_case(Config) when is_list(Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
index e5bb4f3ef6..8b64ff8060 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -90,7 +90,7 @@ id(Opts) ->
     gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),
 					    data = {?MODULE, id, [Opts]}}),
     ct:log("~w:id called", [?MODULE]),
-    os:timestamp().
+    ct_test_support:unique_timestamp().
 
 %% @doc Called before init_per_suite is called. Note that this callback is
 %% only called if the CTH is added before init_per_suite is run (eg. in a test
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
index 5503bf85ae..928bedfed1 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
@@ -25,7 +25,7 @@
 -include_lib("common_test/src/ct_util.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
--define(now, os:timestamp()).
+-define(now, ct_test_support:unique_timestamp()).
 
 %% CT Hooks
 -compile(export_all).
diff --git a/lib/common_test/test/ct_pre_post_test_io_SUITE.erl b/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
index 2994ce4a96..bf3eeee328 100644
--- a/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
+++ b/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
@@ -44,13 +44,29 @@
 %% instance, the tests need to be performed on a separate node (or
 %% there will be clashes with logging processes etc).
 %%--------------------------------------------------------------------
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,120}}].
+
+all() ->
+    [
+     pre_post_io
+    ].
+
 init_per_suite(Config) ->
-    DataDir = ?config(data_dir, Config),
-    CTH = filename:join(DataDir, "cth_ctrl.erl"),
-    ct:pal("Compiling ~p: ~p",
-	   [CTH,compile:file(CTH,[{outdir,DataDir},debug_info])]),
-    ct_test_support:init_per_suite([{path_dirs,[DataDir]},
-				    {start_sasl,true} | Config]).
+    TTInfo = {_T,{_Scaled,ScaleVal}} = ct:get_timetrap_info(),
+    ct:pal("Timetrap info = ~w", [TTInfo]),
+    if ScaleVal > 1 ->
+	    {skip,"Skip on systems running e.g. cover or debug!"};
+       ScaleVal =< 1 ->
+	    DataDir = ?config(data_dir, Config),
+	    CTH = filename:join(DataDir, "cth_ctrl.erl"),
+	    ct:pal("Compiling ~p: ~p",
+		   [CTH,compile:file(CTH,[{outdir,DataDir},
+					  debug_info])]),
+	    ct_test_support:init_per_suite([{path_dirs,[DataDir]},
+					    {start_sasl,true} | Config])
+    end.
 
 end_per_suite(Config) ->
     ct_test_support:end_per_suite(Config).
@@ -61,13 +77,6 @@ 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() ->
-    [
-     pre_post_io
-    ].
-
 %%--------------------------------------------------------------------
 %% TEST CASES
 %%--------------------------------------------------------------------
@@ -90,31 +99,50 @@ pre_post_io(Config) ->
     %%!--------------------------------------------------------------------
 
     spawn(fun() ->
-		  ct:pal("CONTROLLER: Started!", []),
+		  ct:pal("CONTROLLER: Starting test run #1...", []),
 		  %% --- test run 1 ---
-		  ct:sleep(3000),
-		  ct:pal("CONTROLLER: Handle remote events = true", []),
-		  ok = ct_test_support:ct_rpc({cth_log_redirect,
-					       handle_remote_events,
-					       [true]}, Config),
-		  ct:sleep(2000),
-		  ct:pal("CONTROLLER: Proceeding with test run #1!", []),
+		  try_loop(ct_test_support, ct_rpc, [{cth_log_redirect,
+						      handle_remote_events,
+						      [true]}, Config], 3000),
+		  CTLoggerPid1 = ct_test_support:ct_rpc({erlang,whereis,
+							[ct_logs]}, Config),
+		  ct:pal("CONTROLLER: Logger = ~w~nHandle remote events = true",
+			 [CTLoggerPid1]),
+		  ct:sleep(5000),
+		  ct:pal("CONTROLLER: Proceeding with test run #1...", []),
 		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
 		  ct:sleep(6000),
-		  ct:pal("CONTROLLER: Proceeding with shutdown #1!", []),
+		  ct:pal("CONTROLLER: Proceeding with shutdown #1...", []),
 		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
+		  try_loop(fun() ->
+				   false = ct_test_support:ct_rpc({erlang,
+								    is_process_alive,
+								    [CTLoggerPid1]},
+								   Config)
+			   end, 3000),
+		  ct:pal("CONTROLLER: Shutdown #1 complete!", []),
+		  ct:pal("CONTROLLER: Starting test run #2...", []),
 		  %% --- test run 2 ---
-		  ct:sleep(3000),
-		  ct:pal("CONTROLLER: Handle remote events = true", []),
-		  ok = ct_test_support:ct_rpc({cth_log_redirect,
-					       handle_remote_events,
-					       [true]}, Config),
-		  ct:sleep(2000),
-		  ct:pal("CONTROLLER: Proceeding with test run #2!", []),
+		  try_loop(ct_test_support, ct_rpc, [{cth_log_redirect,
+						      handle_remote_events,
+						      [true]}, Config], 3000),
+		  CTLoggerPid2 = ct_test_support:ct_rpc({erlang,whereis,
+							[ct_logs]}, Config),
+		  ct:pal("CONTROLLER: Logger = ~w~nHandle remote events = true",
+			 [CTLoggerPid2]),
+		  ct:sleep(5000),
+		  ct:pal("CONTROLLER: Proceeding with test run #2...", []),
 		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
 		  ct:sleep(6000),
-		  ct:pal("CONTROLLER: Proceeding with shutdown #2!", []),
-		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config)
+		  ct:pal("CONTROLLER: Proceeding with shutdown #2...", []),
+		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
+		  try_loop(fun() ->
+				   false = ct_test_support:ct_rpc({erlang,
+								   is_process_alive,
+								   [CTLoggerPid2]},
+								  Config)
+			   end, 3000),
+		  ct:pal("CONTROLLER: Shutdown #2 complete!", [])
 	  end),
     ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
@@ -157,7 +185,7 @@ pre_post_io(Config) ->
 				      Counters
 			      end, {pre,0,0,0,0}, Ts),
 	      [_|Counters] = tuple_to_list(PrePostIOEntries),
-	      ct:log("Entries in the Pre/Post Test IO Log: ~p", [Counters]),
+	      ct:pal("Entries in the Pre/Post Test IO Log: ~w", [Counters]),
 	      case [C || C <- Counters, C < 2] of
 		  [] ->
 		      ok;
@@ -183,7 +211,7 @@ pre_post_io(Config) ->
 				      [LogN,ErrN+1];
 				 (_, Counters) -> Counters
 			      end, [0,0], Ts),
-	      ct:log("Entries in the Unexpected IO Log: ~p", [UnexpIOEntries]),
+	      ct:log("Entries in the Unexpected IO Log: ~w", [UnexpIOEntries]),
 	      case [N || N <- UnexpIOEntries, N < 2] of
 		  [] ->
 		      ok;
@@ -208,6 +236,38 @@ setup(Test, Config) ->
 reformat(Events, EH) ->
     ct_test_support:reformat(Events, EH).
 
+try_loop(_Fun, 0) ->
+    ct:pal("WARNING! Fun never succeeded!", []),
+    gave_up;
+try_loop(Fun, N) ->
+    try Fun() of
+	{error,_} ->
+	    timer:sleep(10),
+	    try_loop(Fun, N-1);
+	Result ->
+	    Result
+    catch
+	_:_What ->
+	    timer:sleep(10),
+	    try_loop(Fun, N-1)
+    end.
+
+try_loop(M, F, _A, 0) ->
+    ct:pal("WARNING! ~w:~w never succeeded!", [M,F]),
+    gave_up;
+try_loop(M, F, A, N) ->
+    try apply(M, F, A) of
+	{error,_} ->
+	    timer:sleep(10),
+	    try_loop(M, F, A, N-1);
+	Result ->
+	    Result
+    catch
+	_:_ ->
+	    timer:sleep(10),
+	    try_loop(M, F, A, N-1)
+    end.
+
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl b/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl
index b8595b40b9..66a950c178 100644
--- a/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl
+++ b/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl
@@ -53,8 +53,7 @@ init(_Id, _Opts) ->
     receive
 	{?MODULE,proceed} -> ok
     after
-	10000 ->
-	    ok
+	10000 -> ok
     end,
     {ok,[],ct_last}.
 
@@ -66,8 +65,7 @@ terminate(_State) ->
     receive
 	{?MODULE,proceed} -> ok
     after
-       10000 ->
-	    ok
+       10000 -> ok
     end,
     stop_external_logger(cth_logger),
     stop_dispatcher(),
@@ -94,7 +92,7 @@ init_logger(Name) ->
 logger_loop(N) ->
     ct:log("Logger iteration: ~p", [N]),
     error_logger:error_report(N),
-    timer:sleep(250),
+    timer:sleep(100),
     logger_loop(N+1).
 
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 8e7ac9395c..493fa82c79 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -43,6 +43,8 @@
 
 -export([random_error/1]).
 
+-export([unique_timestamp/0]).
+
 -include_lib("kernel/include/file.hrl").
 
 %%%-----------------------------------------------------------------
@@ -110,7 +112,8 @@ start_slave(NodeName, Config, Level) ->
 			      undefined -> [];
 			      Ds -> Ds
 			  end,
-	    PathDirs = [PrivDir,TSDir | AddPathDirs],
+	    TestSupDir = filename:dirname(code:which(?MODULE)),
+	    PathDirs = [PrivDir,TSDir,TestSupDir | AddPathDirs],
 	    [true = rpc:call(CTNode, code, add_patha, [D]) || D <- PathDirs],
 	    test_server:format(Level, "Dirs added to code path (on ~w):~n",
 			       [CTNode]),
@@ -1430,7 +1433,21 @@ rm_files([F | Fs]) ->
     end;
 rm_files([]) ->
     ok.
-    
+
+unique_timestamp() ->
+    unique_timestamp(os:timestamp(), 100000).
+
+unique_timestamp(TS, 0) ->
+    TS;
+unique_timestamp(TS0, N) ->
+    case os:timestamp() of
+	TS0 ->
+	    timer:sleep(1),
+	    unique_timestamp(TS0, N-1);
+	TS1 ->
+	    TS1
+    end.
+
 %%%-----------------------------------------------------------------
 %%%
 slave_stop(Node) ->