aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-09-26 18:05:38 +0200
committerAnders Svensson <[email protected]>2011-09-27 10:11:19 +0200
commit162c0d3ee30790ec5a75e20b0e2e8bc61ed92375 (patch)
tree204824ee5d500815d88631b01a0443ba33cf6289
parent9a80440b68ca6ad37c962ecc333ff37fb7903ae6 (diff)
downloadotp-162c0d3ee30790ec5a75e20b0e2e8bc61ed92375.tar.gz
otp-162c0d3ee30790ec5a75e20b0e2e8bc61ed92375.tar.bz2
otp-162c0d3ee30790ec5a75e20b0e2e8bc61ed92375.zip
Explicit {init,end}_per_group/2 to work around ct bug
Without these functions the result pages are currently mangled. The overview page shows that no suites have run, even though all in fact are, and diameter-specific page is truncated after the dict suite, which is the first suite that relied on an implicit {init,end}_per_group/2. This is apparently the result of a recent common_test commit.
-rw-r--r--lib/diameter/test/diameter_dict_SUITE.erl10
-rw-r--r--lib/diameter/test/diameter_reg_SUITE.erl8
-rw-r--r--lib/diameter/test/diameter_relay_SUITE.erl8
-rw-r--r--lib/diameter/test/diameter_stats_SUITE.erl8
-rw-r--r--lib/diameter/test/diameter_sync_SUITE.erl8
-rw-r--r--lib/diameter/test/diameter_transport_SUITE.erl8
6 files changed, 49 insertions, 1 deletions
diff --git a/lib/diameter/test/diameter_dict_SUITE.erl b/lib/diameter/test/diameter_dict_SUITE.erl
index 170b3c1695..87bb9727fe 100644
--- a/lib/diameter/test/diameter_dict_SUITE.erl
+++ b/lib/diameter/test/diameter_dict_SUITE.erl
@@ -25,7 +25,9 @@
-export([suite/0,
all/0,
- groups/0]).
+ groups/0,
+ init_per_group/2,
+ end_per_group/2]).
%% testcases
-export([append/1,
@@ -69,6 +71,12 @@ tc() ->
update,
update_counter].
+init_per_group(_, Config) ->
+ Config.
+
+end_per_group(_, _) ->
+ ok.
+
%% ===========================================================================
-define(KV100, [{N,[N]} || N <- lists:seq(1,100)]).
diff --git a/lib/diameter/test/diameter_reg_SUITE.erl b/lib/diameter/test/diameter_reg_SUITE.erl
index 83661d48de..ade824c9dd 100644
--- a/lib/diameter/test/diameter_reg_SUITE.erl
+++ b/lib/diameter/test/diameter_reg_SUITE.erl
@@ -26,6 +26,8 @@
-export([suite/0,
all/0,
groups/0,
+ init_per_group/2,
+ end_per_group/2,
init_per_suite/1,
end_per_suite/1]).
@@ -59,6 +61,12 @@ tc() ->
terms,
pids].
+init_per_group(_, Config) ->
+ Config.
+
+end_per_group(_, _) ->
+ ok.
+
init_per_suite(Config) ->
ok = diameter:start(),
Config.
diff --git a/lib/diameter/test/diameter_relay_SUITE.erl b/lib/diameter/test/diameter_relay_SUITE.erl
index cd53fbfd90..0cda2df8ca 100644
--- a/lib/diameter/test/diameter_relay_SUITE.erl
+++ b/lib/diameter/test/diameter_relay_SUITE.erl
@@ -36,6 +36,8 @@
-export([suite/0,
all/0,
groups/0,
+ init_per_group/2,
+ end_per_group/2,
init_per_suite/1,
end_per_suite/1]).
@@ -137,6 +139,12 @@ groups() ->
[{all, [], Ts},
{p, [parallel], Ts}].
+init_per_group(_, Config) ->
+ Config.
+
+end_per_group(_, _) ->
+ ok.
+
init_per_suite(Config) ->
ok = diameter:start(),
diff --git a/lib/diameter/test/diameter_stats_SUITE.erl b/lib/diameter/test/diameter_stats_SUITE.erl
index 85300b0d76..e50a0050a6 100644
--- a/lib/diameter/test/diameter_stats_SUITE.erl
+++ b/lib/diameter/test/diameter_stats_SUITE.erl
@@ -26,6 +26,8 @@
-export([suite/0,
all/0,
groups/0,
+ init_per_group/2,
+ end_per_group/2,
init_per_suite/1,
end_per_suite/1]).
@@ -51,6 +53,12 @@ tc() ->
[an,
twa].
+init_per_group(_, Config) ->
+ Config.
+
+end_per_group(_, _) ->
+ ok.
+
init_per_suite(Config) ->
ok = diameter:start(),
Config.
diff --git a/lib/diameter/test/diameter_sync_SUITE.erl b/lib/diameter/test/diameter_sync_SUITE.erl
index ecd935bd98..84f77b6066 100644
--- a/lib/diameter/test/diameter_sync_SUITE.erl
+++ b/lib/diameter/test/diameter_sync_SUITE.erl
@@ -26,6 +26,8 @@
-export([suite/0,
all/0,
groups/0,
+ init_per_group/2,
+ end_per_group/2,
init_per_suite/1,
end_per_suite/1]).
@@ -57,6 +59,12 @@ tc() ->
timeout,
flush].
+init_per_group(_, Config) ->
+ Config.
+
+end_per_group(_, _) ->
+ ok.
+
init_per_suite(Config) ->
ok = diameter:start(),
Config.
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
index 7c2c1f187e..d545859fe8 100644
--- a/lib/diameter/test/diameter_transport_SUITE.erl
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -27,6 +27,8 @@
-export([suite/0,
all/0,
groups/0,
+ init_per_group/2,
+ end_per_group/2,
init_per_suite/1,
end_per_suite/1]).
@@ -110,6 +112,12 @@ tc() ->
sctp_accept,
sctp_connect].
+init_per_group(_, Config) ->
+ Config.
+
+end_per_group(_, _) ->
+ ok.
+
init_per_suite(Config) ->
ok = diameter:start(),
[{sctp, have_sctp()} | Config].