Merge branch 'maint-r14'

3 files changed, 21 insertions, 14 deletions

diff --git a/lib/mnesia/test/mnesia_evil_backup.erl b/lib/mnesia/test/mnesia_evil_backup.erl
index 63f4146d98..9e0a8db1ae 100644
--- a/lib/mnesia/test/mnesia_evil_backup.erl
+++ b/lib/mnesia/test/mnesia_evil_backup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -244,9 +244,9 @@ restore(Config, Op)  ->
     [rpc:call(Node, ?MODULE, check_tab, [Res31, ?LINE]) || Node <- Nodes],
 
     %% Restore all tables on it's nodes
-    mnesia_schema:clear_table(Tab1),
-    mnesia_schema:clear_table(Tab2),
-    mnesia_schema:clear_table(Tab3),
+    mnesia:clear_table(Tab1),
+    mnesia:clear_table(Tab2),
+    mnesia:clear_table(Tab3),
     [mnesia:dirty_write({Tab1, N, N+1}) || N <- lists:seq(1, 11)],
     [mnesia:dirty_write({Tab2, N, N+1}) || N <- lists:seq(1, 11)],
     [mnesia:dirty_write({Tab3, N, N+1}) || N <- lists:seq(1, 11)],
diff --git a/lib/mnesia/test/mnesia_evil_coverage_test.erl b/lib/mnesia/test/mnesia_evil_coverage_test.erl
index 668eba176f..17d6c6c212 100644
--- a/lib/mnesia/test/mnesia_evil_coverage_test.erl
+++ b/lib/mnesia/test/mnesia_evil_coverage_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -1795,7 +1795,7 @@ subscribe_extended(Config) when is_list(Config) ->
     ?match({mnesia_table_event, {delete, schema, {schema, Tab1}, [{schema, Tab1, _}],_}}, recv_event()),
     ?match({mnesia_table_event, {write, schema, {schema, Tab1, _}, [], _}}, recv_event()),
 
-    ?match({atomic, ok}, mnesia_schema:clear_table(Tab2)),
+    ?match({atomic, ok}, mnesia:clear_table(Tab2)),
     ?match({mnesia_table_event, {delete, schema, {schema, Tab2}, [{schema, Tab2, _}],_}}, 
 	   recv_event()),
     ?match({mnesia_table_event, {write, schema, {schema, Tab2, _}, [], _}}, recv_event()),
diff --git a/lib/mnesia/test/mnesia_install_test.erl b/lib/mnesia/test/mnesia_install_test.erl
index 5d55fcac0e..3a2d44aa95 100644
--- a/lib/mnesia/test/mnesia_install_test.erl
+++ b/lib/mnesia/test/mnesia_install_test.erl
@@ -205,7 +205,7 @@ silly_upgrade(Config) when is_list(Config) ->
     ?match(ok, mnesia:install_fallback(Bup2)),
     file:delete(Bup2),
     %% Will generate intentional crash, fatal error
-    ?match([], mnesia_test_lib:stop_mnesia([Node2])),  
+    ?match([], mnesia_test_lib:stop_mnesia([Node2])),
     wait_till_dead([Node1, Node2]),
     ?match([], mnesia_test_lib:start_mnesia([Node1, Node2], [Tab1, Tab2])),
     ?match(match, verify_state(Tab1, Tab2, CpState)),
@@ -213,22 +213,29 @@ silly_upgrade(Config) when is_list(Config) ->
     ?match(ok, mnesia:install_fallback(Bup)),
     file:delete(Bup),
     %% Will generate intentional crash, fatal error
-    ?match([], mnesia_test_lib:stop_mnesia([Node1, Node2])),  
+    ?match([], mnesia_test_lib:stop_mnesia([Node1, Node2])),
     wait_till_dead([Node1, Node2]),
     ?match([], mnesia_test_lib:start_mnesia([Node1, Node2], [Tab1, Tab2])),
     CpState2 = [X || X <- CpState, element(1, X) /= Tab1],
     ?match(match, verify_state(Tab1, Tab2, CpState2)),
     ?verify_mnesia(Nodes, []).
 
-wait_till_dead([]) -> ok;
-wait_till_dead([N|Ns]) ->
+wait_till_dead([]) ->
+    ok; %% timer:sleep(5);
+wait_till_dead(Repeat = [N|Ns]) ->
     Apps = rpc:call(N, application, which_applications, []),
     case lists:keymember(mnesia, 1, Apps) of
-	true -> 
+	true ->
 	    timer:sleep(10),
-	    wait_till_dead([N|Ns]);
-	false -> 
-	    wait_till_dead(Ns)
+	    wait_till_dead(Repeat);
+	false ->
+	    case rpc:call(N, erlang, whereis, [mnesia_monitor]) of
+		undefined ->
+		    wait_till_dead(Ns);
+		_ ->
+		    timer:sleep(10),
+		    wait_till_dead(Repeat)
+	    end
     end.
 
 add_some_records(Tab1, Tab2, Old) ->