Merge branch 'dgud/test-cuddle'

* dgud/test-cuddle:
  Windows: Skip tests that requires admin privileges
  observer: add debug info to ttb_SUITE
  mnesia: add debug printouts

5 files changed, 66 insertions, 48 deletions

diff --git a/erts/test/nt_SUITE.erl b/erts/test/nt_SUITE.erl
index f798a40a6c..624e5484ba 100644
--- a/erts/test/nt_SUITE.erl
+++ b/erts/test/nt_SUITE.erl
@@ -37,13 +37,13 @@ suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap, {minutes, 3}}].
 
-all() -> 
-    case os:type() of
-        {win32, nt} ->
-            [nt, service_basic, service_env, user_env, synced,
-             service_prio, logout, debug, restart, restart_always,
-             stopaction];
-        _ -> [nt]
+all() ->
+    case {os:type(), os:version()} of
+	{{win32, nt}, Vsn} when Vsn =< {6,1,999999} ->
+	    [nt, service_basic, service_env, user_env, synced,
+	     service_prio, logout, debug, restart, restart_always,
+	     stopaction];
+	_ -> [nt]
     end.
 
 init_per_testcase(_Func, Config) ->
@@ -367,11 +367,13 @@ stopaction(Config) when is_list(Config) ->
 %%% other platforms than NT.
 
 nt(Config) when is_list(Config) ->
-    case os:type() of
-        {win32,nt} ->
-            nt_run();
-        _ ->
-            {skipped, "This test case is intended for Win NT only."}
+    case {os:type(), os:version()} of
+	{{win32, nt}, Vsn} when Vsn =< {6,1,999999} ->
+	    nt_run();
+	{{win32, nt},  _} ->
+	    {skipped, "This test case requires admin privileges on Win 8 and later."};
+	_ ->
+	    {skipped, "This test case is intended for Win NT only."}
     end.
 
 
diff --git a/lib/mnesia/test/mnesia_config_test.erl b/lib/mnesia/test/mnesia_config_test.erl
index a31c9b1f4f..204b8fa394 100644
--- a/lib/mnesia/test/mnesia_config_test.erl
+++ b/lib/mnesia/test/mnesia_config_test.erl
@@ -693,9 +693,9 @@ event_module(Config) when is_list(Config) ->
 	  end,
 
     ?match({[ok, ok], []}, rpc:multicall(Nodes, mnesia, start, [Def])),
-    receive after 1000 -> ok end,
+    receive after 2000 -> ok end,
     mnesia_event ! {get_log, self()},
-    DebugLog1 = receive 
+    DebugLog1 = receive
 		    {log, L1} -> L1
 		after 10000 -> [timeout]
 		end,
@@ -706,9 +706,9 @@ event_module(Config) when is_list(Config) ->
 
     ?match({[ok], []}, rpc:multicall([N2], mnesia, start, [])),
 
-    receive after 1000 -> ok end,
+    receive after 2000 -> ok end,
     mnesia_event ! {get_log, self()},
-    DebugLog = receive 
+    DebugLog = receive
 		   {log, L} -> L
 	       after 10000 -> [timeout]
 	       end,
diff --git a/lib/mnesia/test/mnesia_consistency_test.erl b/lib/mnesia/test/mnesia_consistency_test.erl
index 6c3e68ba38..9cc84de87b 100644
--- a/lib/mnesia/test/mnesia_consistency_test.erl
+++ b/lib/mnesia/test/mnesia_consistency_test.erl
@@ -565,6 +565,7 @@ consistency_after_fallback_3_disc_only(Config) when is_list(Config) ->
     consistency_after_fallback(disc_only_copies, 3, Config).
 
 consistency_after_fallback(ReplicaType, NodeConfig, Config) ->
+    put(mnesia_test_verbose, true),
     %%?verbose("Starting consistency_after_fallback2 at ~p~n", [self()]),
     Delay = 5,
     Nodes = ?acquire_nodes(NodeConfig, [{tc_timeout, timer:minutes(10)} | Config]),
@@ -594,10 +595,11 @@ consistency_after_fallback(ReplicaType, NodeConfig, Config) ->
     ?match(ok, mnesia_tpcb:verify_tabs()),
     
     %% Stop and then start mnesia and check table consistency
-    %%?verbose("Restarting Mnesia~n", []),
+    ?verbose("Kill Mnesia~n", []),
     mnesia_test_lib:kill_mnesia(Nodes),
+    ?verbose("Start Mnesia~n", []),
     mnesia_test_lib:start_mnesia(Nodes,[account,branch,teller,history]),
-    
+    ?verbose("Verify tabs~n", []),
     ?match(ok, mnesia_tpcb:verify_tabs()),
     if 
 	ReplicaType == ram_copies ->
diff --git a/lib/observer/test/ttb_SUITE.erl b/lib/observer/test/ttb_SUITE.erl
index 499cdb3fc8..c06ec21f36 100644
--- a/lib/observer/test/ttb_SUITE.erl
+++ b/lib/observer/test/ttb_SUITE.erl
@@ -819,6 +819,7 @@ myhandler(_Fd,Trace,_,Relay) ->
 
 simple_call_handler() ->
     {fun(A, {trace_ts, _, call, _, _} ,_,_) -> io:format(A, "ok.~n", []);
+	(A, {drop, N}, _, _) -> io:format(A, "{drop, ~p}.", [N]);
 	(_, end_of_trace, _, _) -> ok end, []}.
 
 marking_call_handler() ->
@@ -954,17 +955,24 @@ begin_trace_local(ServerNode, ClientNode, Dest) ->
     ?line ttb:tpl(client, get, []).
 
 check_size(N, Dest, Output, ServerNode, ClientNode) ->
-    ?line begin_trace(ServerNode, ClientNode, Dest),
-    ?line case Dest of
+    begin_trace(ServerNode, ClientNode, Dest),
+    case Dest of
         {local, _} ->
-            ?line ttb_helper:msgs_ip(N);
+            ttb_helper:msgs_ip(N);
         _ ->
-            ?line ttb_helper:msgs(N)
+	    ttb_helper:msgs(N)
     end,
-    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
-    ?line ttb:format(D, [{out, Output}, {handler, simple_call_handler()}]),
-    ?line {ok, Ret} = file:consult(Output),
-    ?line true = (N + 1 == length(Ret)).
+    {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ttb:format(D, [{out, Output}, {handler, simple_call_handler()}]),
+    {ok, Ret} = file:consult(Output),
+    check_output(N+1, Ret).
+
+check_output(Expected, Ret)
+  when length(Ret) =:= Expected -> ok;
+check_output(Expected, Ret) ->
+    io:format("~p~n",[Ret]),
+    io:format("Expected ~p got ~p ~n",[Expected, length(Ret)]),
+    Expected = length(Ret).
 
 fetch_when_no_option_given(suite) ->
     [];
@@ -1166,8 +1174,8 @@ changing_cwd_on_control_node(Config) when is_list(Config) ->
     ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
     ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
     ?line {ok, Ret} = file:consult(?OUTPUT),
-    ?line true = (2*(NumMsgs + 1) == length(Ret)),
-    ?line ok = file:set_cwd(OldDir).
+    check_output(2*(NumMsgs + 1),Ret),
+    ok = file:set_cwd(OldDir).
 changing_cwd_on_control_node(cleanup,_Config) ->
     ?line stop_client_and_server().
 
@@ -1176,18 +1184,19 @@ changing_cwd_on_control_node_with_local_trace(suite) ->
 changing_cwd_on_control_node_with_local_trace(doc) ->
     ["Changing cwd on control node during local tracing is safe"];
 changing_cwd_on_control_node_with_local_trace(Config) when is_list(Config) ->
-    ?line {ok, OldDir} = file:get_cwd(),
-    ?line {ServerNode, ClientNode} = start_client_and_server(),
-    ?line begin_trace(ServerNode, ClientNode, {local, ?FNAME}),
-    ?line NumMsgs = 3,
-    ?line ttb_helper:msgs_ip(NumMsgs),
-    ?line ok = file:set_cwd(".."),
-    ?line ttb_helper:msgs_ip(NumMsgs),
-    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
-    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
-    ?line {ok, Ret} = file:consult(?OUTPUT),
-    ?line true = (2*(NumMsgs + 1) == length(Ret)),
-    ?line ok = file:set_cwd(OldDir).
+    {ok, OldDir} = file:get_cwd(),
+    {ServerNode, ClientNode} = start_client_and_server(),
+    begin_trace(ServerNode, ClientNode, {local, ?FNAME}),
+    NumMsgs = 3,
+    ttb_helper:msgs_ip(NumMsgs),
+    ok = file:set_cwd(".."),
+    ttb_helper:msgs_ip(NumMsgs),
+    {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
+    {ok, Ret} = file:consult(?OUTPUT),
+    Expected = 2*(NumMsgs + 1),
+    check_output(Expected, Ret),
+    ok = file:set_cwd(OldDir).
 changing_cwd_on_control_node_with_local_trace(cleanup,_Config) ->
     ?line stop_client_and_server().
 
@@ -1205,7 +1214,7 @@ changing_cwd_on_remote_node(Config) when is_list(Config) ->
     ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
     ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
     ?line {ok, Ret} = file:consult(?OUTPUT),
-    ?line true = (2*(NumMsgs + 1) == length(Ret)).
+    check_output(2*(NumMsgs + 1),Ret).
 changing_cwd_on_remote_node(cleanup,_Config) ->
     ?line stop_client_and_server().
 
@@ -1497,7 +1506,7 @@ logic(N, M, TracingType) ->
     ct:log("formatted ~p",[{D,?OUTPUT}]),
     ?line {ok, Ret} = file:consult(?OUTPUT),
     ct:log("consulted: ~p",[Ret]),
-    ?line M = length(Ret).
+    check_output(M,Ret).
 
 begin_trace_with_resume(ServerNode, ClientNode, Dest) ->
     ?line {ok, _} = ttb:tracer([ServerNode,ClientNode], [{file, Dest}, resume]),
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index ee620dcdb4..4dcaec03a7 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -54,7 +54,7 @@ unix_cases() ->
 	    end,
     [target_system, target_system_unicode] ++ RunErlCases ++ cases().
 
-win32_cases() -> 
+win32_cases() ->
     [{group,release} | cases()].
 
 %% Cases that can be run on all platforms
@@ -89,11 +89,16 @@ groups() ->
 %% {group,release}
 %% Top group for all cases using run_erl
 init_per_group(release, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    P1gInstall = filename:join(priv_dir(Config),p1g_install),
-    ok = create_p1g(Config,P1gInstall),
-    ok = create_p1h(Config),
-    ?t:timetrap_cancel(Dog);
+    case {os:type(), os:version()} of
+	{{win32, nt}, Vsn} when Vsn > {6,1,999999} ->
+	    {skip, "Requires admin privileges on Win 8 and later"};
+	_ ->
+	    Dog = ?t:timetrap(?default_timeout),
+	    P1gInstall = filename:join(priv_dir(Config),p1g_install),
+	    ok = create_p1g(Config,P1gInstall),
+	    ok = create_p1h(Config),
+	    ?t:timetrap_cancel(Dog)
+    end;
 
 %% {group,release_single}
 %% Subgroup of {group,release}, contains all cases that are not