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/common_test/src/ct_framework.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/common_test/src/ct_framework.erl')
| -rw-r--r-- | lib/common_test/src/ct_framework.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index 02a5d60445..fb89685b7b 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -478,7 +478,6 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) -> _ -> ok end, - ct_util:delete_testdata(comment), ct_util:delete_suite_data(last_saved_config), FuncSpec = @@ -1026,19 +1025,20 @@ make_conf(Mod, Name, Props, TestSpec) -> _ -> ok end, - {InitConf,EndConf} = + {InitConf,EndConf,ExtraProps} = case erlang:function_exported(Mod,init_per_group,2) of true -> - {{Mod,init_per_group},{Mod,end_per_group}}; + {{Mod,init_per_group},{Mod,end_per_group},[]}; false -> ct_logs:log("TEST INFO", "init_per_group/2 and " "end_per_group/2 missing for group " "~p in ~p, using default.", [Name,Mod]), {{?MODULE,ct_init_per_group}, - {?MODULE,ct_end_per_group}} + {?MODULE,ct_end_per_group}, + [{suite,Mod}]} end, - {conf,[{name,Name}|Props],InitConf,TestSpec,EndConf}. + {conf,[{name,Name}|Props++ExtraProps],InitConf,TestSpec,EndConf}. %%%----------------------------------------------------------------- |