diff options
| author | Peter Andersson <[email protected]> | 2010-06-03 14:40:16 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-06-09 16:19:21 +0200 |
| commit | 5d01bdc2c4c3cc18150711ebfab4c84abdfc0b45 (patch) | |
| tree | b6b0007b983b94746087542b4ef13ff79b794c05 /lib/common_test/test/ct_skip_SUITE.erl | |
| parent | 7c6504029f84c52de40a6b29b2fd1b17c053ccec (diff) | |
| download | otp-5d01bdc2c4c3cc18150711ebfab4c84abdfc0b45.tar.gz otp-5d01bdc2c4c3cc18150711ebfab4c84abdfc0b45.tar.bz2 otp-5d01bdc2c4c3cc18150711ebfab4c84abdfc0b45.zip | |
Improve and fix various test suites
Diffstat (limited to 'lib/common_test/test/ct_skip_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_skip_SUITE.erl | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/common_test/test/ct_skip_SUITE.erl b/lib/common_test/test/ct_skip_SUITE.erl index 9f428723f5..2e02061dec 100644 --- a/lib/common_test/test/ct_skip_SUITE.erl +++ b/lib/common_test/test/ct_skip_SUITE.erl @@ -89,14 +89,14 @@ auto_skip(Config) when is_list(Config) -> ], {Opts,ERPid} = setup({suite,Suites}, Config), - ok = ct_test_support:run(ct, run_test, [Opts], Config), + ok = ct_test_support:run(Opts, Config), Events = ct_test_support:get_events(ERPid, Config), ct_test_support:log_events(auto_skip, reformat(Events, ?eh), ?config(priv_dir, Config)), - TestEvents = test_events(auto_skip), + TestEvents = events_to_check(auto_skip), ok = ct_test_support:verify_events(TestEvents, Events, Config). @@ -112,14 +112,14 @@ user_skip(Config) when is_list(Config) -> Join(DataDir, "user_skip_5_SUITE")], {Opts,ERPid} = setup({suite,Suites}, Config), - ok = ct_test_support:run(ct, run_test, [Opts], Config), + ok = ct_test_support:run(Opts, Config), Events = ct_test_support:get_events(ERPid, Config), ct_test_support:log_events(user_skip, reformat(Events, ?eh), ?config(priv_dir, Config)), - TestEvents = test_events(user_skip), + TestEvents = events_to_check(user_skip), ok = ct_test_support:verify_events(TestEvents, Events, Config). %%%----------------------------------------------------------------- @@ -142,6 +142,15 @@ reformat(Events, EH) -> %%%----------------------------------------------------------------- %%% TEST EVENTS %%%----------------------------------------------------------------- +events_to_check(Test) -> + %% 2 tests (ct:run_test + script_start) is default + events_to_check(Test, 2). + +events_to_check(_, 0) -> + []; +events_to_check(Test, N) -> + test_events(Test) ++ events_to_check(Test, N-1). + test_events(auto_skip) -> [ {?eh,start_logging,{'DEF','RUNDIR'}}, |