aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/test
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-09-19 12:30:41 +0200
committerAnders Svensson <[email protected]>2011-09-26 17:11:07 +0200
commitcfda2e2834bcb766d8f85777ac61e7cc25e25f4d (patch)
tree124b2879941cbcb5bd6c6ddd744683ae616061ab /lib/diameter/test
parent2c21849168b76b2cece7f14474ed30d9f734d6e4 (diff)
downloadotp-cfda2e2834bcb766d8f85777ac61e7cc25e25f4d.tar.gz
otp-cfda2e2834bcb766d8f85777ac61e7cc25e25f4d.tar.bz2
otp-cfda2e2834bcb766d8f85777ac61e7cc25e25f4d.zip
Use groups for parallel testcase execution
Diffstat (limited to 'lib/diameter/test')
-rw-r--r--lib/diameter/test/diameter_dict_SUITE.erl14
-rw-r--r--lib/diameter/test/diameter_reg_SUITE.erl12
-rw-r--r--lib/diameter/test/diameter_stats_SUITE.erl12
-rw-r--r--lib/diameter/test/diameter_sync_SUITE.erl12
-rw-r--r--lib/diameter/test/diameter_transport_SUITE.erl15
5 files changed, 31 insertions, 34 deletions
diff --git a/lib/diameter/test/diameter_dict_SUITE.erl b/lib/diameter/test/diameter_dict_SUITE.erl
index 3db9907074..170b3c1695 100644
--- a/lib/diameter/test/diameter_dict_SUITE.erl
+++ b/lib/diameter/test/diameter_dict_SUITE.erl
@@ -24,11 +24,11 @@
-module(diameter_dict_SUITE).
-export([suite/0,
- all/0]).
+ all/0,
+ groups/0]).
%% testcases
--export([scramble/1,
- append/1,
+-export([append/1,
fetch/1,
fetch_keys/1,
filter/1,
@@ -51,7 +51,10 @@ suite() ->
[{timetrap, {seconds, 10}}].
all() ->
- [scramble | tc()].
+ [{group, all} | tc()].
+
+groups() ->
+ [{all, [parallel], tc()}].
tc() ->
[append,
@@ -68,9 +71,6 @@ tc() ->
%% ===========================================================================
-scramble(Config) ->
- [] = ?util:run(?util:scramble([{?MODULE, [F, Config]} || F <- tc()])).
-
-define(KV100, [{N,[N]} || N <- lists:seq(1,100)]).
append(_) ->
diff --git a/lib/diameter/test/diameter_reg_SUITE.erl b/lib/diameter/test/diameter_reg_SUITE.erl
index 5ae6c494e3..83661d48de 100644
--- a/lib/diameter/test/diameter_reg_SUITE.erl
+++ b/lib/diameter/test/diameter_reg_SUITE.erl
@@ -25,12 +25,12 @@
-export([suite/0,
all/0,
+ groups/0,
init_per_suite/1,
end_per_suite/1]).
%% testcases
--export([scramble/1,
- add/1,
+-export([add/1,
add_new/1,
del/1,
repl/1,
@@ -46,7 +46,10 @@ suite() ->
[{timetrap, {seconds, 10}}].
all() ->
- [scramble | tc()].
+ [{group, all} | tc()].
+
+groups() ->
+ [{all, [parallel], tc()}].
tc() ->
[add,
@@ -65,9 +68,6 @@ end_per_suite(_Config) ->
%% ===========================================================================
-scramble(Config) ->
- [] = ?util:run(?util:scramble([{?MODULE, [F, Config]} || F <- tc()])).
-
add(_) ->
Ref = make_ref(),
true = ?reg:add(Ref),
diff --git a/lib/diameter/test/diameter_stats_SUITE.erl b/lib/diameter/test/diameter_stats_SUITE.erl
index e0bf6b8c4a..85300b0d76 100644
--- a/lib/diameter/test/diameter_stats_SUITE.erl
+++ b/lib/diameter/test/diameter_stats_SUITE.erl
@@ -25,12 +25,12 @@
-export([suite/0,
all/0,
+ groups/0,
init_per_suite/1,
end_per_suite/1]).
%% testcases
--export([scramble/1,
- an/1,
+-export([an/1,
twa/1]).
-define(stat, diameter_stats).
@@ -42,7 +42,10 @@ suite() ->
[{timetrap, {seconds, 10}}].
all() ->
- [scramble | tc()].
+ [{group, all} | tc()].
+
+groups() ->
+ [{all, [parallel], tc()}].
tc() ->
[an,
@@ -57,9 +60,6 @@ end_per_suite(_Config) ->
%% ===========================================================================
-scramble(Config) ->
- [] = ?util:run(?util:scramble([{?MODULE, [F, Config]} || F <- tc()])).
-
an(_) ->
Ref = {'_', make_ref()},
true = ?stat:reg(Ref),
diff --git a/lib/diameter/test/diameter_sync_SUITE.erl b/lib/diameter/test/diameter_sync_SUITE.erl
index 1b1fec8281..ecd935bd98 100644
--- a/lib/diameter/test/diameter_sync_SUITE.erl
+++ b/lib/diameter/test/diameter_sync_SUITE.erl
@@ -25,12 +25,12 @@
-export([suite/0,
all/0,
+ groups/0,
init_per_suite/1,
end_per_suite/1]).
%% testcases
--export([scramble/1,
- call/1,
+-export([call/1,
cast/1,
timeout/1,
flush/1]).
@@ -46,7 +46,10 @@ suite() ->
[{timetrap, {seconds, 10}}].
all() ->
- [scramble | tc()].
+ [{group, all} | tc()].
+
+groups() ->
+ [{all, [parallel], tc()}].
tc() ->
[call,
@@ -63,9 +66,6 @@ end_per_suite(_Config) ->
%% ===========================================================================
-scramble(Config) ->
- [] = ?util:run(?util:scramble([{?MODULE, [F, Config]} || F <- tc()])).
-
call(_) ->
Ref = make_ref(),
Q = {q, Ref},
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
index 7543a62cad..7c2c1f187e 100644
--- a/lib/diameter/test/diameter_transport_SUITE.erl
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -26,12 +26,12 @@
-export([suite/0,
all/0,
+ groups/0,
init_per_suite/1,
end_per_suite/1]).
%% testcases
--export([scramble/1,
- tcp_accept/1,
+-export([tcp_accept/1,
tcp_connect/1,
sctp_accept/1,
sctp_connect/1]).
@@ -99,7 +99,10 @@ suite() ->
[{timetrap, {minutes, 2}}].
all() ->
- [scramble | tc()].
+ [{group, all} | tc()].
+
+groups() ->
+ [{all, [parallel], tc()}].
tc() ->
[tcp_accept,
@@ -115,12 +118,6 @@ end_per_suite(_Config) ->
ok = diameter:stop().
%% ===========================================================================
-%% scramble/1
-
-scramble(Config) ->
- [] = ?util:run(?util:scramble([{?MODULE, [F, Config]} || F <- tc()])).
-
-%% ===========================================================================
%% tcp_accept/1
%% sctp_accept/1
%%