Merge branch 'siri/sasl/convert-to-common-test/OTP-9740'

* siri/sasl/convert-to-common-test/OTP-9740:
  Convert sasl test suites to pure common test style

1 files changed, 183 insertions, 226 deletions

diff --git a/lib/sasl/test/rb_SUITE.erl b/lib/sasl/test/rb_SUITE.erl
index b53c382609..35a4eb7e7b 100644
--- a/lib/sasl/test/rb_SUITE.erl
+++ b/lib/sasl/test/rb_SUITE.erl
@@ -18,7 +18,8 @@
 %%
 
 -module(rb_SUITE).
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
+
 
 -compile(export_all).
 
@@ -45,19 +46,10 @@ groups() ->
 				     ]}].
 
 
-all(suite) -> 
-    no_group_cases() ++
-	[{conf, 
-	  install_mf_h, 
-	  element(3,lists:keyfind(running_error_logger,1,groups())), 
-	  remove_mf_h}
-	].
-
-
 init_per_suite(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line RbDir = filename:join(PrivDir,rb),
-    ?line ok = file:make_dir(RbDir),
+    PrivDir = ?config(priv_dir,Config),
+    RbDir = filename:join(PrivDir,rb),
+    ok = file:make_dir(RbDir),
     NewConfig = [{rb_dir,RbDir}|Config],
     reset_sasl(NewConfig),
     NewConfig.
@@ -66,10 +58,18 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(running_error_logger,Config) ->
-    install_mf_h(Config).
+    %% Install log_mf_h
+    RbDir = ?config(rb_dir,Config),
+    ok = application:set_env(sasl,error_logger_mf_dir,RbDir),
+    ok = application:set_env(sasl,error_logger_mf_maxbytes,5000),
+    ok = application:set_env(sasl,error_logger_mf_maxfiles,2),
+    restart_sasl(),
+    Config.
 
 end_per_group(running_error_logger,Config) ->
-    remove_mf_h(Config).
+    %% Remove log_mf_h???
+    ok.
+
 
 init_per_testcase(_Case,Config) ->
     case whereis(?SUP) of
@@ -92,187 +92,152 @@ end_per_testcase(Case,Config) ->
 
 
 %%%-----------------------------------------------------------------
+%%% Test cases
 
-help() -> help(suite).
-help(suite) -> [];
 help(_Config) ->
-    ?line Help = capture(fun() -> rb:h() end),
-    ?line "Report Browser Tool - usage" = hd(Help),
-    ?line "rb:stop            - stop the rb_server" = lists:last(Help),
+    Help = capture(fun() -> rb:h() end),
+    "Report Browser Tool - usage" = hd(Help),
+    "rb:stop            - stop the rb_server" = lists:last(Help),
     ok.
 
-
-start_error_stop() -> start_error_stop(suite).
-start_error_stop(suite) -> [];
+%% Test that all three sasl env vars must be set for a successful start of rb
+%% Then stop rb.
 start_error_stop(Config) ->
-    ?line RbDir = ?config(rb_dir,Config),
-
-    ?line {error,{"cannot locate report directory",_}} = rb:start(),
-
-
-    ?line ok = application:set_env(sasl,error_logger_mf_dir,"invaliddir"),
-    ?line ok = application:set_env(sasl,error_logger_mf_maxbytes,1000),
-    ?line ok = application:set_env(sasl,error_logger_mf_maxfiles,2),
-    ?line restart_sasl(),
-    ?line {error,{"cannot read the index file",_}} = rb:start(),
-    ?line ok = application:set_env(sasl,error_logger_mf_dir,RbDir),
-    ?line restart_sasl(),
-    ?line {ok,_} = rb:start(),
-
-    ?line ok = rb:stop(),
-    ok.
+    RbDir = ?config(rb_dir,Config),
 
+    {error,{"cannot locate report directory",_}} = rb:start(),
 
-%% start_opts(suite) -> [];
-%% start_opts(Config) ->
-%%     PrivDir = ?config(priv_dir,Config),
-%%     RbDir = filename:join(PrivDir,rb_opts),
-%%     ok = file:make_dir(RbDir),
-       
 
-install_mf_h(Config) ->
-    ?line RbDir = ?config(rb_dir,Config),
-    ?line ok = application:set_env(sasl,error_logger_mf_dir,RbDir),
-    ?line ok = application:set_env(sasl,error_logger_mf_maxbytes,5000),
-    ?line ok = application:set_env(sasl,error_logger_mf_maxfiles,2),
-    ?line restart_sasl(),
-    Config.
+    ok = application:set_env(sasl,error_logger_mf_dir,"invaliddir"),
+    ok = application:set_env(sasl,error_logger_mf_maxbytes,1000),
+    ok = application:set_env(sasl,error_logger_mf_maxfiles,2),
+    restart_sasl(),
+    {error,{"cannot read the index file",_}} = rb:start(),
+    ok = application:set_env(sasl,error_logger_mf_dir,RbDir),
+    restart_sasl(),
+    {ok,_} = rb:start(),
 
-remove_mf_h(_Config) ->
+    ok = rb:stop(),
     ok.
 
-
-
-show() -> show(suite).
-show(suite) -> [];
 show(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
-    
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+
     %% Insert some reports in the error log and start rb
     init_error_logs(),
-    ?line ok = start_rb(OutFile),
+    ok = start_rb(OutFile),
 
     %% Show all reports
-    ?line All = check_report(fun() -> rb:show() end,OutFile),
+    All = check_report(fun() -> rb:show() end,OutFile),
 
     %% Show by number
-    ?line [{_,First}] = check_report(fun() -> rb:show(1) end,OutFile),
-    ?line {1,First} = lists:keyfind(1,1,All),    
+    [{_,First}] = check_report(fun() -> rb:show(1) end,OutFile),
+    {1,First} = lists:keyfind(1,1,All),
 
     %% Show by type
-    ?line [{_,CR}] = check_report(fun() -> rb:show(crash_report) end,OutFile),
-    ?line true = contains(CR,"rb_test_crash"),
-    ?line [{_,EC},{_,EM}] = check_report(fun() -> rb:show(error) end,OutFile),
-    ?line true = contains(EC,"rb_test_crash"),
-    ?line true = contains(EM,"rb_test_error_msg"),
-    ?line [{_,ER}] = check_report(fun() -> rb:show(error_report) end,OutFile),
-    ?line true = contains(ER,"rb_test_error"),
-    ?line [{_,IR}] = check_report(fun() -> rb:show(info_report) end,OutFile),
-    ?line true = contains(IR,"rb_test_info"),
-    ?line [{_,IM}] = check_report(fun() -> rb:show(info_msg) end,OutFile),
-    ?line true = contains(IM,"rb_test_info_msg"),
-    ?line [_|_] = check_report(fun() -> rb:show(progress) end,OutFile),
-    ?line [{_,SR}] = check_report(fun() -> rb:show(supervisor_report) end,
-				   OutFile),
-    ?line true = contains(SR,"child_terminated"),
-    ?line true = contains(SR,"{rb_SUITE,rb_test_crash}"),
+    [{_,CR}] = check_report(fun() -> rb:show(crash_report) end,OutFile),
+    true = contains(CR,"rb_test_crash"),
+    [{_,EC},{_,EM}] = check_report(fun() -> rb:show(error) end,OutFile),
+    true = contains(EC,"rb_test_crash"),
+    true = contains(EM,"rb_test_error_msg"),
+    [{_,ER}] = check_report(fun() -> rb:show(error_report) end,OutFile),
+    true = contains(ER,"rb_test_error"),
+    [{_,IR}] = check_report(fun() -> rb:show(info_report) end,OutFile),
+    true = contains(IR,"rb_test_info"),
+    [{_,IM}] = check_report(fun() -> rb:show(info_msg) end,OutFile),
+    true = contains(IM,"rb_test_info_msg"),
+    [_|_] = check_report(fun() -> rb:show(progress) end,OutFile),
+    [{_,SR}] = check_report(fun() -> rb:show(supervisor_report) end,
+			    OutFile),
+    true = contains(SR,"child_terminated"),
+    true = contains(SR,"{rb_SUITE,rb_test_crash}"),
 
     ok.
 
-list() -> list(suite).
-list(suite) -> [];
 list(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
 
     %% Insert some reports in the error log and start rb
     init_error_logs(),
-    ?line ok = start_rb(OutFile),
-
-    ?line All = capture(fun() -> rb:list() end),
-    ?line [{crash_report,[_]=CR},
-	   {error,[_,_]=EM},
-	   {error_report,[_]=ER},
-	   {info_msg,[_]=IM},
-	   {info_report,[_]=IR},
-	   {progress,[_|_]=P},
-	   {supervisor_report,[_]=SR}] = sort_list(All),
-
-    ?line [{crash_report,CR}] = 
+    ok = start_rb(OutFile),
+
+    All = capture(fun() -> rb:list() end),
+    [{crash_report,[_]=CR},
+     {error,[_,_]=EM},
+     {error_report,[_]=ER},
+     {info_msg,[_]=IM},
+     {info_report,[_]=IR},
+     {progress,[_|_]=P},
+     {supervisor_report,[_]=SR}] = sort_list(All),
+
+    [{crash_report,CR}] =
 	sort_list(capture(fun() -> rb:list(crash_report) end)),
-    ?line [{error,EM}] = 
+    [{error,EM}] =
 	sort_list(capture(fun() -> rb:list(error) end)),
-    ?line [{error_report,ER}] = 
+    [{error_report,ER}] =
 	sort_list(capture(fun() -> rb:list(error_report) end)),
-    ?line [{info_msg,IM}] = 
+    [{info_msg,IM}] =
 	sort_list(capture(fun() -> rb:list(info_msg) end)),
-    ?line [{info_report,IR}] = 
+    [{info_report,IR}] =
 	sort_list(capture(fun() -> rb:list(info_report) end)),
-    ?line [{progress,P}] = 
+    [{progress,P}] =
 	sort_list(capture(fun() -> rb:list(progress) end)),
-    ?line [{supervisor_report,SR}] = 
+    [{supervisor_report,SR}] =
 	sort_list(capture(fun() -> rb:list(supervisor_report) end)),
-    
-    ok.
 
+    ok.
 
-grep() -> grep(suite).
-grep(suite) -> [];
 grep(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
 
     %% Insert some reports in the error log and start rb
     init_error_logs(),
-    ?line ok = start_rb(OutFile),
-
-    ?line [{_,S},
-	   {_,CR},
-	   {_,EC},
-	   {_,IM},
-	   {_,IR},
-	   {_,EM},
-	   {_,ER}]= check_report(fun() -> rb:grep("rb_test_") end,OutFile),
-    ?line true = contains(S, "rb_test_crash"),
-    ?line true = contains(CR, "rb_test_crash"),
-    ?line true = contains(EC, "rb_test_crash"),
-    ?line true = contains(IM, "rb_test_info_msg"),
-    ?line true = contains(IR, "rb_test_info"),
-    ?line true = contains(EM, "rb_test_error_msg"),
-    ?line true = contains(ER, "rb_test_error"),
+    ok = start_rb(OutFile),
+
+    [{_,S},
+     {_,CR},
+     {_,EC},
+     {_,IM},
+     {_,IR},
+     {_,EM},
+     {_,ER}]= check_report(fun() -> rb:grep("rb_test_") end,OutFile),
+    true = contains(S, "rb_test_crash"),
+    true = contains(CR, "rb_test_crash"),
+    true = contains(EC, "rb_test_crash"),
+    true = contains(IM, "rb_test_info_msg"),
+    true = contains(IR, "rb_test_info"),
+    true = contains(EM, "rb_test_error_msg"),
+    true = contains(ER, "rb_test_error"),
     ok.
 
-
-filter_filter() -> filter_filter(suite).
-filter_filter(suite) -> [];
 filter_filter(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
 
     %% Insert some reports in the error log and start rb
     init_error_logs(),
-    ?line ok = start_rb(OutFile),
+    ok = start_rb(OutFile),
 
-    ?line All = check_report(fun() -> rb:show() end,OutFile),
+    All = check_report(fun() -> rb:show() end,OutFile),
 
-    ?line ER = [_] = rb_filter([{rb_SUITE,rb_test_error}],OutFile),
-    ?line [] = rb_filter([{rb_SUITE,rb_test}],OutFile),
-    ?line _E = [_,_] = rb_filter([{rb_SUITE,"rb_test",re}],OutFile),
-    ?line AllButER = rb_filter([{rb_SUITE,rb_test_error,no}],OutFile),
+    ER = [_] = rb_filter([{rb_SUITE,rb_test_error}],OutFile),
+    [] = rb_filter([{rb_SUITE,rb_test}],OutFile),
+    _E = [_,_] = rb_filter([{rb_SUITE,"rb_test",re}],OutFile),
+    AllButER = rb_filter([{rb_SUITE,rb_test_error,no}],OutFile),
 
     {_,AllRep} = lists:unzip(All),
     {_,ERRep} = lists:unzip(ER),
     {_,AllButERRep} = lists:unzip(AllButER),
-    ?line AllButERRep = AllRep -- ERRep,
+    AllButERRep = AllRep -- ERRep,
 
     ok.
 
-filter_date() -> filter_date(suite).
-filter_date(suite) -> [];
 filter_date(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
 
 
     %% Insert some reports in the error log and start rb
@@ -280,35 +245,33 @@ filter_date(Config) ->
     Between1 = calendar:local_time(),
     timer:sleep(1000),
     Between2 = calendar:local_time(),
-    ?line ok = start_rb(OutFile),
+    ok = start_rb(OutFile),
 
-    ?line All = check_report(fun() -> rb:show() end,OutFile),
+    All = check_report(fun() -> rb:show() end,OutFile),
 
     Before = calendar:gregorian_seconds_to_datetime(
-	      calendar:datetime_to_gregorian_seconds(calendar:local_time()) - 10),
+	       calendar:datetime_to_gregorian_seconds(calendar:local_time()) - 10),
     After = calendar:gregorian_seconds_to_datetime(
 	      calendar:datetime_to_gregorian_seconds(calendar:local_time()) + 1),
 
-    ?line All = rb_filter([],{Before,from},OutFile),
-    ?line All = rb_filter([],{After,to},OutFile),
-    ?line [] = rb_filter([],{Before,to},OutFile),
-    ?line [] = rb_filter([],{After,from},OutFile),
-    ?line All = rb_filter([],{Before,After},OutFile),
+    All = rb_filter([],{Before,from},OutFile),
+    All = rb_filter([],{After,to},OutFile),
+    [] = rb_filter([],{Before,to},OutFile),
+    [] = rb_filter([],{After,from},OutFile),
+    All = rb_filter([],{Before,After},OutFile),
 
     %%?t:format("~p~n",[All]),
-    ?line AllButLast = [{N-1,R} || {N,R} <- tl(All)],
-    ?line AllButLast = rb_filter([],{Before,Between1},OutFile),
+    AllButLast = [{N-1,R} || {N,R} <- tl(All)],
+    AllButLast = rb_filter([],{Before,Between1},OutFile),
 
-    ?line Last = hd(All),
-    ?line [Last] = rb_filter([],{Between2,After},OutFile),
+    Last = hd(All),
+    [Last] = rb_filter([],{Between2,After},OutFile),
 
     ok.
 
-filter_filter_and_date() -> filter_filter_and_date(suite).
-filter_filter_and_date(suite) -> [];
 filter_filter_and_date(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
 
 
     %% Insert some reports in the error log and start rb
@@ -316,102 +279,96 @@ filter_filter_and_date(Config) ->
     Between1 = calendar:local_time(),
     timer:sleep(1000),
     Between2 = calendar:local_time(),
-    ?line error_logger:error_report([{rb_SUITE,rb_test_filter}]),    
-    ?line ok = start_rb(OutFile),
+    error_logger:error_report([{rb_SUITE,rb_test_filter}]),
+    ok = start_rb(OutFile),
 
     Before = calendar:gregorian_seconds_to_datetime(
-	      calendar:datetime_to_gregorian_seconds(calendar:local_time()) - 10),
+	       calendar:datetime_to_gregorian_seconds(calendar:local_time()) - 10),
     After = calendar:gregorian_seconds_to_datetime(
 	      calendar:datetime_to_gregorian_seconds(calendar:local_time()) + 1),
 
-    ?line All = check_report(fun() -> rb:show() end,OutFile),
-    ?line Last = hd(All),
+    All = check_report(fun() -> rb:show() end,OutFile),
+    Last = hd(All),
 
-    ?line [_,_,_] = rb_filter([{rb_SUITE,"rb_test",re}],{Before,After},OutFile),
-    ?line [_,_] = rb_filter([{rb_SUITE,"rb_test",re}],{Before,Between1},OutFile),
-    ?line [_] = rb_filter([{rb_SUITE,"rb_test",re}],{Between2,After},OutFile),
-    ?line [_] = rb_filter([{rb_SUITE,rb_test_filter}],{Before,After},OutFile),
-    ?line [] = rb_filter([{rb_SUITE,rb_test_filter}],{Before,Between1},OutFile),
-    ?line [Last] = rb_filter([{rb_SUITE,rb_test_filter,no}],{Between2,After},OutFile),
-    ?line {_,Str} = Last,
-    ?line false = contains(Str,"rb_test_filter"),
+    [_,_,_] = rb_filter([{rb_SUITE,"rb_test",re}],{Before,After},OutFile),
+    [_,_] = rb_filter([{rb_SUITE,"rb_test",re}],{Before,Between1},OutFile),
+    [_] = rb_filter([{rb_SUITE,"rb_test",re}],{Between2,After},OutFile),
+    [_] = rb_filter([{rb_SUITE,rb_test_filter}],{Before,After},OutFile),
+    [] = rb_filter([{rb_SUITE,rb_test_filter}],{Before,Between1},OutFile),
+    [Last] = rb_filter([{rb_SUITE,rb_test_filter,no}],{Between2,After},OutFile),
+    {_,Str} = Last,
+    false = contains(Str,"rb_test_filter"),
 
     ok.
 
 
-filter_re_no() -> filter_re_no(suite).
-filter_re_no(suite) -> [];
 filter_re_no(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
 
     %% Insert some reports in the error log and start rb
     init_error_logs(),
-    ?line ok = start_rb(OutFile),
+    ok = start_rb(OutFile),
 
-    ?line All = check_report(fun() -> rb:show() end,OutFile),
+    All = check_report(fun() -> rb:show() end,OutFile),
 
-    ?line E = [_,_] = rb_filter([{rb_SUITE,"rb_test",re}],OutFile),
-    ?line AllButE = rb_filter([{rb_SUITE,"rb_test",re,no}],OutFile),
+    E = [_,_] = rb_filter([{rb_SUITE,"rb_test",re}],OutFile),
+    AllButE = rb_filter([{rb_SUITE,"rb_test",re,no}],OutFile),
 
     {_,AllRep} = lists:unzip(All),
     {_,ERep} = lists:unzip(E),
     {_,AllButERep} = lists:unzip(AllButE),
-    ?line AllButERep = AllRep -- ERep,
+    AllButERep = AllRep -- ERep,
 
     ok.
 
 
-rescan() -> rescan(suite).
-rescan(suite) -> [];
 rescan(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
-    
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+
     %% Start rb
-    ?line ok = start_rb(OutFile),
+    ok = start_rb(OutFile),
 
     %% Insert one more report and check that the list is longer. Note
     %% that there might be two more reports, since the progress report
     %% from starting rb_server might not be included before the rescan.
-    ?line AllBefore = capture(fun() -> rb:list() end),
-    ?line error_logger:error_report([{rb_SUITE,rb_test_rescan}]),
-    ?line ok = rb:rescan(),
-    ?line AllAfter = capture(fun() -> rb:list() end),
-    ?line Diff = length(AllAfter) - length(AllBefore),
-    ?line true = (Diff >= 1),
+    AllBefore = capture(fun() -> rb:list() end),
+    error_logger:error_report([{rb_SUITE,rb_test_rescan}]),
+    ok = rb:rescan(),
+    AllAfter = capture(fun() -> rb:list() end),
+    Diff = length(AllAfter) - length(AllBefore),
+    true = (Diff >= 1),
 
     ok.
 
 
-start_stop_log() -> start_stop_log(suite).
-start_stop_log(suite) -> [];
 start_stop_log(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
-    ?line ok = file:write_file(OutFile,[]),
+    PrivDir = ?config(priv_dir,Config),
+    OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    ok = file:write_file(OutFile,[]),
 
     %% Start rb and check that show is printed to standard_io
-    ?line ok = start_rb(),
-    ?line StdioResult = [_|_] = capture(fun() -> rb:show(1) end),
-    ?line {ok,<<>>} = file:read_file(OutFile),
-    
+    ok = start_rb(),
+    StdioResult = [_|_] = capture(fun() -> rb:show(1) end),
+    {ok,<<>>} = file:read_file(OutFile),
+
     %% Start log and check that show is printed to log and not to standad_io
-    ?line ok = rb:start_log(OutFile),
-    ?line [] = capture(fun() -> rb:show(1) end),
-    ?line {ok,Bin} = file:read_file(OutFile),
-    ?line true = (Bin =/= <<>>),
+    ok = rb:start_log(OutFile),
+    [] = capture(fun() -> rb:show(1) end),
+    {ok,Bin} = file:read_file(OutFile),
+    true = (Bin =/= <<>>),
 
     %% Stop log and check that show is printed to standard_io and not to log
-    ?line ok = rb:stop_log(),
-    ?line ok = file:write_file(OutFile,[]),
-    ?line StdioResult = capture(fun() -> rb:show(1) end),
-    ?line {ok,<<>>} = file:read_file(OutFile),
+    ok = rb:stop_log(),
+    ok = file:write_file(OutFile,[]),
+    StdioResult = capture(fun() -> rb:show(1) end),
+    {ok,<<>>} = file:read_file(OutFile),
 
     %% Test that standard_io is used if log file can not be opened
-    ?line ok = rb:start_log(filename:join(nonexistingdir,"newfile.txt")),
-    ?line StdioResult = capture(fun() -> rb:show(1) end),
-    ?line {ok,<<>>} = file:read_file(OutFile),    
+    ok = rb:start_log(filename:join(nonexistingdir,"newfile.txt")),
+    StdioResult = capture(fun() -> rb:show(1) end),
+    {ok,<<>>} = file:read_file(OutFile),
 
     ok.
 
@@ -435,7 +392,7 @@ empty_error_logs(Config) ->
     catch delete_content(?config(rb_dir, Config)),
     ok = application:start(sasl),
     wait_for_sasl().
-    
+
 wait_for_sasl() ->
     wait_for_sasl(50).
 wait_for_sasl(0) ->
@@ -448,7 +405,7 @@ wait_for_sasl(N) ->
 	    timer:sleep(100),
 	    wait_for_sasl(N-1)
     end.
-    
+
 start_rb(OutFile) ->
     do_start_rb([{start_log,OutFile}]).
 start_rb() ->
@@ -482,20 +439,20 @@ delete_content(Dir) ->
 		  Files).
 
 init_error_logs() ->        
-    ?line error_logger:error_report([{rb_SUITE,rb_test_error}]),
-    ?line error_logger:error_msg("rb_test_error_msg"),
-    ?line error_logger:info_report([{rb_SUITE,rb_test_info}]),
-    ?line error_logger:info_msg("rb_test_info_msg"),
-    ?line _Pid = start(),
-    ?line Ref = erlang:monitor(process,?MODULE),
-    ?line gen_server:cast(?MODULE,crash),
-    ?line receive {'DOWN',Ref,process,_,{rb_SUITE,rb_test_crash}} -> ok 
-	  after 2000 -> 
-		  ?t:format("Got: ~p~n",[process_info(self(),messages)]),
-		  ?t:fail("rb_SUITE server never died")
-	  end,
-    ?line erlang:demonitor(Ref),
-    ?line wait_for_server(),
+    error_logger:error_report([{rb_SUITE,rb_test_error}]),
+    error_logger:error_msg("rb_test_error_msg"),
+    error_logger:info_report([{rb_SUITE,rb_test_info}]),
+    error_logger:info_msg("rb_test_info_msg"),
+    _Pid = start(),
+    Ref = erlang:monitor(process,?MODULE),
+    gen_server:cast(?MODULE,crash),
+    receive {'DOWN',Ref,process,_,{rb_SUITE,rb_test_crash}} -> ok
+    after 2000 ->
+	    ?t:format("Got: ~p~n",[process_info(self(),messages)]),
+	    ?t:fail("rb_SUITE server never died")
+    end,
+    erlang:demonitor(Ref),
+    wait_for_server(),
     ok.
 
 wait_for_server() ->