Merge branch 'dgud/mnesia/test-fixes' into dev

* dgud/mnesia/test-fixes:
  Verify that remote data is commited before dirty ops begin
  Fix mnesia own small test framework so it works with the re-written tests.

5 files changed, 85 insertions, 36 deletions

diff --git a/lib/mnesia/test/.gitignore b/lib/mnesia/test/.gitignore
new file mode 100644
index 0000000000..1e9a9933ed
--- /dev/null
+++ b/lib/mnesia/test/.gitignore
@@ -0,0 +1,9 @@
+
+
+# Test generates
+MnesiaCore*
+Mnesia.*
+
+tempfile*
+mnesia_test_case_info
+test_log*
\ No newline at end of file
diff --git a/lib/mnesia/test/mnesia_durability_test.erl b/lib/mnesia/test/mnesia_durability_test.erl
index 55205d1222..2fee72f066 100644
--- a/lib/mnesia/test/mnesia_durability_test.erl
+++ b/lib/mnesia/test/mnesia_durability_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -119,8 +119,8 @@ load_latest_data(Config) when is_list(Config) ->
 
     ?match([], mnesia_test_lib:kill_mnesia([N2])),
     ?match(ok, mnesia:dirty_write(Rec1)),
-    ?match([], mnesia_test_lib:kill_mnesia([N1])),
     ?match([], mnesia_test_lib:kill_mnesia([N3])),
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
 
     ?match([], mnesia_test_lib:start_mnesia([N2], [])),   
     %% Should wait for N1
diff --git a/lib/mnesia/test/mnesia_qlc_test.erl b/lib/mnesia/test/mnesia_qlc_test.erl
index 141de71d01..5f46840ae9 100644
--- a/lib/mnesia/test/mnesia_qlc_test.erl
+++ b/lib/mnesia/test/mnesia_qlc_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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
@@ -70,6 +70,7 @@ init_testcases(Type,Config) ->
 	    end,
     All = fun() -> [Write(Id) || Id <- lists:seq(1,10)], ok end,
     ?match({atomic, ok}, mnesia:sync_transaction(All)),
+    ?match({atomic, [{b, {b,100-1}, 1}]}, mnesia:transaction(fun() -> mnesia:read({b, {b, 99}}) end)),
     Nodes.
 
 %% Test cases       
diff --git a/lib/mnesia/test/mnesia_test_lib.erl b/lib/mnesia/test/mnesia_test_lib.erl
index 182c240084..9da45975d5 100644
--- a/lib/mnesia/test/mnesia_test_lib.erl
+++ b/lib/mnesia/test/mnesia_test_lib.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
@@ -413,32 +413,28 @@ test_driver([T|TestCases], Config) ->
     [L1|L2];
 test_driver({Module, TestCases}, Config) when is_list(TestCases)->
     test_driver(default_module(Module, TestCases), Config);
-test_driver({_, {Module, TestCase}}, Config) ->
-    test_driver({Module, TestCase}, Config);
+test_driver({Module, all}, Config) ->
+    get_suite(Module, all, Config);
+test_driver({Module, G={group, _}}, Config) ->
+    get_suite(Module, G, Config);
+test_driver({_, {group, Module, Group}}, Config) ->
+    get_suite(Module, {group, Group}, Config);
+
 test_driver({Module, TestCase}, Config) ->
     Sec = timer:seconds(1) * 1000,
-    case get_suite(Module, TestCase) of
-	[] when Config == suite ->
+    case Config of
+	suite ->
 	    {Module, TestCase, 'IMPL'};
-	[] ->
+	_ ->
 	    log("Eval test case: ~w~n", [{Module, TestCase}]),
-	    {T, Res} =
-		timer:tc(?MODULE, eval_test_case, [Module, TestCase, Config]),
-	    log("Tested ~w in ~w sec~n", [TestCase, T div Sec]),
-	    {T div Sec, Res};
-	Suite when is_list(Suite), Config == suite ->
-	    Res = test_driver(default_module(Module, Suite), Config),
-	    {{Module, TestCase}, Res};
-	Suite when is_list(Suite) ->
-	    log("Expand test case ~w~n", [{Module, TestCase}]),
-	    Def = default_module(Module, Suite),
-	    {T, Res} = timer:tc(?MODULE, test_driver, [Def, Config]),
-	    {T div Sec, {{Module, TestCase}, Res}};
-	'NYI' when Config == suite ->
-	    {Module, TestCase, 'NYI'};
-	'NYI' ->
-      	    log("<WARNING> Test case ~w NYI~n", [{Module, TestCase}]),
-	    {0, {skip, {Module, TestCase}, "NYI"}}
+	    try timer:tc(?MODULE, eval_test_case, [Module, TestCase, Config]) of
+		{T, Res} -> 
+		    log("Tested ~w in ~w sec~n", [TestCase, T div Sec]),
+		    {T div Sec, Res}
+	    catch error:function_clause -> 
+		    log("<WARNING> Test case ~w NYI~n", [{Module, TestCase}]),
+		    {0, {skip, {Module, TestCase}, "NYI"}}
+	    end
     end;
 test_driver(TestCase, Config) ->
     DefaultModule = mnesia_SUITE,
@@ -449,18 +445,50 @@ test_driver(TestCase, Config) ->
 default_module(DefaultModule, TestCases) when is_list(TestCases) ->
     Fun = fun(T) ->
 		  case T of
+		      {group, _} -> {true, {DefaultModule, T}};
 		      {_, _} -> true;
 		      T -> {true, {DefaultModule, T}}
 		  end
 	  end,
     lists:zf(Fun, TestCases).
 
+get_suite(Module, TestCase, Config) ->
+    case get_suite(Module, TestCase) of
+	Suite when is_list(Suite), Config == suite ->
+	    Res = test_driver(default_module(Module, Suite), Config),
+	    {{Module, TestCase}, Res};
+	Suite when is_list(Suite) ->
+	    log("Expand test case ~w~n", [{Module, TestCase}]),
+	    Def = default_module(Module, Suite),
+	    {T, Res} = timer:tc(?MODULE, test_driver, [Def, Config]),
+	    Sec = timer:seconds(1) * 1000,
+	    {T div Sec, {{Module, TestCase}, Res}};
+	'NYI' when Config == suite ->
+	    {Module, TestCase, 'NYI'};
+	'NYI' ->
+      	    log("<WARNING> Test case ~w NYI~n", [{Module, TestCase}]),
+	    {0, {skip, {Module, TestCase}, "NYI"}}
+    end.
+
 %% Returns a list (possibly empty) or the atom 'NYI'
-get_suite(Mod, Fun) ->
-    case catch (apply(Mod, Fun, [suite])) of
+get_suite(Mod, {group, Suite}) ->
+    try 
+	Groups = Mod:groups(),
+	{_, _, TCList} = lists:keyfind(Suite, 1, Groups),
+	TCList
+    catch
+	_:Reason ->
+	    io:format("Not implemented ~p ~p (~p ~p)~n", 
+		      [Mod,Suite,Reason, erlang:get_stacktrace()]),
+	    'NYI'
+    end;
+get_suite(Mod, all) ->
+    case catch (apply(Mod, all, [])) of
 	{'EXIT', _} -> 'NYI';
 	List when is_list(List) -> List
-    end.
+    end;
+get_suite(_Mod, _Fun) -> 
+    [].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -503,9 +531,13 @@ wait_for_evaluator(Pid, Mod, Fun, Config) ->
 
 test_case_evaluator(Mod, Fun, [Config]) ->
     NewConfig = Mod:init_per_testcase(Fun, Config),
-    R = apply(Mod, Fun, [NewConfig]),
-    Mod:end_per_testcase(Fun, NewConfig),
-    exit({test_case_ok, R}).
+    try 
+	R = apply(Mod, Fun, [NewConfig]),
+	Mod:end_per_testcase(Fun, NewConfig),
+	exit({test_case_ok, R})
+    catch error:function_clause ->
+	    exit({skipped, 'NYI'})
+    end.
 
 activity_evaluator(Coordinator) ->
     activity_evaluator_loop(Coordinator),
diff --git a/lib/mnesia/test/mt.erl b/lib/mnesia/test/mt.erl
index f69c4a11fd..322bd52130 100644
--- a/lib/mnesia/test/mt.erl
+++ b/lib/mnesia/test/mt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -76,17 +76,24 @@ resolve(Suite0) when is_atom(Suite0) ->
 	Suite when is_atom(Suite) ->
 	    {Suite, all};
 	{Suite, Case} ->
-	    {Suite, Case}
+	    {Suite, is_group(Suite,Case)}
     end;
 resolve({Suite0, Case}) when is_atom(Suite0), is_atom(Case) ->
     case alias(Suite0) of
 	Suite when is_atom(Suite) ->
-	    {Suite, Case};
+	    {Suite, is_group(Suite,Case)};
 	{Suite, Case2} ->
-	    {Suite, Case2}
+	    {Suite, is_group(Suite,Case2)}
     end;
 resolve(List) when is_list(List) ->
     [resolve(Case) || Case <- List].
+
+is_group(Mod, Case) ->
+    try {_,_,_} = lists:keyfind(Case, 1, Mod:groups()),
+	 {group, Case}
+    catch _:{badmatch,_} ->
+	    Case
+    end.
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Run one or more test cases