diff options
| author | Peter Andersson <[email protected]> | 2011-09-27 01:24:12 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-09-27 14:05:59 +0200 |
| commit | 26550631bf825d738bd8c20c9fdb600e9867d81f (patch) | |
| tree | ca0382b4394f271c80a6e305d0c0b698b951d39f /lib/test_server/src/test_server_ctrl.erl | |
| parent | 5891e32d8fe1b7ad05e9bca4f37bad746ee64c21 (diff) | |
| download | otp-26550631bf825d738bd8c20c9fdb600e9867d81f.tar.gz otp-26550631bf825d738bd8c20c9fdb600e9867d81f.tar.bz2 otp-26550631bf825d738bd8c20c9fdb600e9867d81f.zip | |
Fix problem with test_server_ctrl creating invalid conf test
OTP-9584
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index 7554a31530..4fad86d16d 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -2039,6 +2039,21 @@ add_init_and_end_per_suite([{skip_case,{conf,_,{Mod,_},_}}=Case|Cases], LastMod, PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)]; add_init_and_end_per_suite([{skip_case,_}=Case|Cases], LastMod, LastRef, FwMod) -> [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)]; +add_init_and_end_per_suite([{conf,Ref,Props,{FwMod,Func}}=Case|Cases], LastMod, + LastRef, FwMod) -> + %% if Mod == FwMod, this conf test is (probably) a test case group where + %% the init- and end-functions are missing in the suite, and if so, + %% the suite name should be stored as {suite,Suite} in Props + case proplists:get_value(suite, Props) of + Suite when Suite =/= undefined, Suite =/= LastMod -> + {PreCases, NextMod, NextRef} = + do_add_init_and_end_per_suite(LastMod, LastRef, Suite), + Case1 = {conf,Ref,proplists:delete(suite,Props),{FwMod,Func}}, + PreCases ++ [Case1|add_init_and_end_per_suite(Cases, NextMod, + NextRef, FwMod)]; + _ -> + [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)] + end; add_init_and_end_per_suite([{conf,_,_,{Mod,_}}=Case|Cases], LastMod, LastRef, FwMod) when Mod =/= LastMod, Mod =/= FwMod -> {PreCases, NextMod, NextRef} = |