Merge branch 'dgud/mnesia/fix_majority_test' into dev

* dgud/mnesia/fix_majority_test:
  Convert majority tests to common test framework

3 files changed, 14 insertions, 112 deletions

diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
index dc8f216c1c..2267a94164 100644
--- a/lib/mnesia/test/mnesia_SUITE.erl
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -78,12 +78,14 @@ groups() ->
       [{group, install}, {group, atomicity},
        {group, isolation}, {group, durability},
        {group, recovery}, {group, consistency},
+       {group, majority},
        {group, mnesia_frag_test, medium}]},
      {atomicity, [], [{mnesia_atomicity_test, all}]},
      {isolation, [], [{mnesia_isolation_test, all}]},
      {durability, [], [{mnesia_durability_test, all}]},
      {recovery, [], [{mnesia_recovery_test, all}]},
      {consistency, [], [{mnesia_consistency_test, all}]},
+     {majority, [], [{mnesia_majority_test, all}]},
      %% The 'heavy' test suite runs some resource consuming tests and
      %% benchmarks
      {heavy, [], [{group, measure}]},
@@ -142,105 +144,6 @@ silly() ->
     mnesia_install_test:silly().
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-light(doc) ->
-    ["The 'light' test suite runs a selected set of test suites and is",
-     "intended to be the smallest test suite that is meaningful",
-     "to run. It starts with an installation test (which in essence is the",
-     "'silly' test case) and then it covers all functions in the API in",
-     "various depths. All configuration parameters and examples are also",
-     "covered."];
-light(suite) ->
-    [
-     install,
-     nice,
-     evil,
-     {mnesia_frag_test, light},
-     qlc,
-     registry,
-     config,
-     examples
-    ].
-
-install(suite) ->
-    [{mnesia_install_test, all}].
-
-nice(suite) ->
-    [{mnesia_nice_coverage_test, all}].
-
-evil(suite) ->
-    [{mnesia_evil_coverage_test, all}].
-
-qlc(suite) ->
-    [{mnesia_qlc_test, all}].
-
-registry(suite) ->
-    [{mnesia_registry_test, all}].
-
-config(suite) ->
-    [{mnesia_config_test, all}].
-
-examples(suite) ->
-    [{mnesia_examples_test, all}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-medium(doc) ->
-    ["The 'medium' test suite verfies the ACID (atomicity, consistency",
-     "isolation and durability) properties and various recovery scenarios",
-     "These tests may take quite while to run."];
-medium(suite) ->
-    [
-     install,
-     atomicity,
-     isolation,
-     durability,
-     recovery,
-     consistency,
-     majority,
-     {mnesia_frag_test, medium}
-    ].
-
-atomicity(suite) ->
-     [{mnesia_atomicity_test, all}].
-
-isolation(suite) ->
-    [{mnesia_isolation_test, all}].
-
-durability(suite) ->
-    [{mnesia_durability_test, all}].
-
-recovery(suite) ->
-    [{mnesia_recovery_test, all}].
-
-consistency(suite) ->
-     [{mnesia_consistency_test, all}].
-
-majority(suite) ->
-    [{mnesia_majority_test, all}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-heavy(doc) ->
-    ["The 'heavy' test suite runs some resource consuming tests and",
-     "benchmarks"];
-heavy(suite) ->
-    [measure].
-
-measure(suite) ->
-    [{mnesia_measure_test, all}].
-
-prediction(suite) ->
-    [{mnesia_measure_test, prediction}].
-
-fairness(suite) ->
-    [{mnesia_measure_test, fairness}].
-
-benchmarks(suite) ->
-    [{mnesia_measure_test, benchmarks}].
-
-consumption(suite) ->
-    [{mnesia_measure_test, consumption}].
-
-scalability(suite) ->
-    [{mnesia_measure_test, scalability}].
 
 clean_up_suite(doc) -> ["Not a test case only kills mnesia and nodes, that where" 
 			"started during the tests"];
diff --git a/lib/mnesia/test/mnesia_majority_test.erl b/lib/mnesia/test/mnesia_majority_test.erl
index 17d1d8bcdd..41ba0fd601 100644
--- a/lib/mnesia/test/mnesia_majority_test.erl
+++ b/lib/mnesia/test/mnesia_majority_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -26,13 +26,11 @@
 init_per_testcase(Func, Conf) ->
     mnesia_test_lib:init_per_testcase(Func, Conf).
 
-fin_per_testcase(Func, Conf) ->
-    mnesia_test_lib:fin_per_testcase(Func, Conf).
+end_per_testcase(Func, Conf) ->
+    mnesia_test_lib:end_per_testcase(Func, Conf).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-all(doc) ->
-    ["Verify that majority checking works"];
-all(suite) ->
+all() ->
     [
      write
      , wread
@@ -45,7 +43,7 @@ all(suite) ->
 
 write(suite) -> [];
 write(Config) when is_list(Config) ->
-    [N1, N2, N3] = Nodes = ?acquire_nodes(3, Config),
+    [N1, N2, N3] = ?acquire_nodes(3, Config),
     Tab = t,
     Schema = [{name, Tab}, {ram_copies, [N1,N2,N3]}, {majority,true}],
     ?match({atomic, ok}, mnesia:create_table(Schema)),
@@ -62,7 +60,7 @@ write(Config) when is_list(Config) ->
 
 wread(suite) -> [];
 wread(Config) when is_list(Config) ->
-    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    [N1, N2] = ?acquire_nodes(2, Config),
     Tab = t,
     Schema = [{name, Tab}, {ram_copies, [N1,N2]}, {majority,true}],
     ?match({atomic, ok}, mnesia:create_table(Schema)),
@@ -76,7 +74,7 @@ wread(Config) when is_list(Config) ->
 
 delete(suite) -> [];
 delete(Config) when is_list(Config) ->
-    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    [N1, N2] = ?acquire_nodes(2, Config),
     Tab = t,
     Schema = [{name, Tab}, {ram_copies, [N1,N2]}, {majority,true}],
     ?match({atomic, ok}, mnesia:create_table(Schema)),
@@ -100,7 +98,7 @@ delete(Config) when is_list(Config) ->
 
 clear_table(suite) -> [];
 clear_table(Config) when is_list(Config) ->
-    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    [N1, N2] = ?acquire_nodes(2, Config),
     Tab = t,
     Schema = [{name, Tab}, {ram_copies, [N1,N2]}, {majority,true}],
     ?match({atomic, ok}, mnesia:create_table(Schema)),
@@ -122,7 +120,7 @@ clear_table(Config) when is_list(Config) ->
 
 frag(suite) -> [];
 frag(Config) when is_list(Config) ->
-    [N1] = Nodes = ?acquire_nodes(1, Config),
+    [N1] = ?acquire_nodes(1, Config),
     Tab = t,
     Schema = [
 	      {name, Tab}, {ram_copies, [N1]},
@@ -135,7 +133,7 @@ frag(Config) when is_list(Config) ->
 
 change_majority(suite) -> [];
 change_majority(Config) when is_list(Config) ->
-    [N1,N2] = Nodes = ?acquire_nodes(2, Config),
+    [N1,N2] = ?acquire_nodes(2, Config),
     Tab = t,
     Schema = [
 	      {name, Tab}, {ram_copies, [N1,N2]},
@@ -158,7 +156,7 @@ change_majority(Config) when is_list(Config) ->
 
 frag_change_majority(suite) -> [];
 frag_change_majority(Config) when is_list(Config) ->
-    [N1,N2] = Nodes = ?acquire_nodes(2, Config),
+    [N1,N2] = ?acquire_nodes(2, Config),
     Tab = t,
     Schema = [
 	      {name, Tab}, {ram_copies, [N1,N2]},
diff --git a/lib/mnesia/test/mt.erl b/lib/mnesia/test/mt.erl
index 322bd52130..f1152a7bc4 100644
--- a/lib/mnesia/test/mt.erl
+++ b/lib/mnesia/test/mt.erl
@@ -57,6 +57,7 @@ alias(heavy) -> {mnesia_SUITE, heavy};
 alias(install) -> mnesia_install_test;
 alias(isolation) -> mnesia_isolation_test;
 alias(light) -> {mnesia_SUITE, light};
+alias(majority) -> mnesia_majority_test;
 alias(measure) -> mnesia_measure_test;
 alias(medium) -> {mnesia_SUITE, medium};
 alias(nice) -> mnesia_nice_coverage_test;