diff options
| author | Peter Andersson <[email protected]> | 2014-02-17 12:36:01 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-02-17 12:36:01 +0100 |
| commit | ce9abdaeb3b1c8da1e8116a91316f1341ac4f7cf (patch) | |
| tree | d70cadb27eacf96cddcfbe71be3351b288344406 | |
| parent | 656b800e52ebdf71c1a0097270977092c1510147 (diff) | |
| parent | 0ae290cce8a3e54458efa1b212f154e6473b0288 (diff) | |
| download | otp-ce9abdaeb3b1c8da1e8116a91316f1341ac4f7cf.tar.gz otp-ce9abdaeb3b1c8da1e8116a91316f1341ac4f7cf.tar.bz2 otp-ce9abdaeb3b1c8da1e8116a91316f1341ac4f7cf.zip | |
Merge branch 'peppe/common_test/ct_test_support_updates'
* peppe/common_test/ct_test_support_updates:
Fix problem with verification for parallel groups in ct_telnet_SUITE
| -rw-r--r-- | lib/common_test/test/ct_telnet_SUITE.erl | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/lib/common_test/test/ct_telnet_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE.erl index 25debf09d4..acce4eca14 100644 --- a/lib/common_test/test/ct_telnet_SUITE.erl +++ b/lib/common_test/test/ct_telnet_SUITE.erl @@ -215,23 +215,18 @@ all_cases(Suite,Config) -> fun({group,G}) -> {value,{G,Props,GTCs}} = lists:keysearch(G,1,Suite:groups()), - GTCs1 = case lists:member(parallel,Props) of - true -> - %%! TEMPORARY WORKAROUND FOR PROBLEM - %%! WITH ct_test_support NOT HANDLING - %%! VERIFICATION OF PARALLEL GROUPS - %%! CORRECTLY! - []; - false -> - [[{?eh,tc_start,{Suite,GTC}}, - {?eh,tc_done,{Suite,GTC,ok}}] || - GTC <- GTCs] - end, - [{?eh,tc_start,{Suite,{init_per_group,G,Props}}}, - {?eh,tc_done,{Suite,{init_per_group,G,Props},ok}} | - GTCs1] ++ - [{?eh,tc_start,{Suite,{end_per_group,G,Props}}}, - {?eh,tc_done,{Suite,{end_per_group,G,Props},ok}}]; + GTCs1 = [[{?eh,tc_start,{Suite,GTC}}, + {?eh,tc_done,{Suite,GTC,ok}}] || + GTC <- GTCs], + GEvs = [{?eh,tc_start,{Suite,{init_per_group,G,Props}}}, + {?eh,tc_done,{Suite,{init_per_group,G,Props},ok}} | + GTCs1] ++ + [{?eh,tc_start,{Suite,{end_per_group,G,Props}}}, + {?eh,tc_done,{Suite,{end_per_group,G,Props},ok}}], + case lists:member(parallel, Props) of + true -> [{parallel,GEvs}]; + false -> GEvs + end; (TC) -> [{?eh,tc_done,{Suite,TC,ok}}] end, GroupsAndTCs), |