diff options
| author | Björn Gustavsson <[email protected]> | 2012-11-26 11:47:54 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-11-26 11:47:54 +0100 |
| commit | 073b4404714d31aff96a46419ecd34c018da5bab (patch) | |
| tree | c6d59391518bc86b82fd326d977ec45dd6a21aea /lib/common_test/test/ct_test_support.erl | |
| parent | 2d974c56b23a7544b13f78061850a877316ae938 (diff) | |
| parent | 42b20176c1ed7f819ec1b436bc6d1f8987269e48 (diff) | |
| download | otp-073b4404714d31aff96a46419ecd34c018da5bab.tar.gz otp-073b4404714d31aff96a46419ecd34c018da5bab.tar.bz2 otp-073b4404714d31aff96a46419ecd34c018da5bab.zip | |
Merge branch 'bjorn/ct/env-vars/OTP-10469'
* bjorn/ct/env-vars/OTP-10469:
Add support for passing environment variables in master mode
Remove redundant sleep in ct_master_SUITE
Test that test cases succeed
Add ct_test_support:verify_events/4 which takes a node name
Diffstat (limited to 'lib/common_test/test/ct_test_support.erl')
| -rw-r--r-- | lib/common_test/test/ct_test_support.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 901e53c71d..e5e2e68fcb 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -32,7 +32,7 @@ run/2, run/3, run/4, get_opts/1, wait_for_ct_stop/1]). -export([handle_event/2, start_event_receiver/1, get_events/2, - verify_events/3, reformat/2, log_events/4, + verify_events/3, verify_events/4, reformat/2, log_events/4, join_abs_dirs/2]). -export([ct_test_halt/1]). @@ -370,6 +370,14 @@ verify_events(TEvs, Evs, Config) -> ok end. +verify_events(TEvs, Evs, Node, Config) -> + case catch verify_events1(TEvs, Evs, Node, Config) of + {'EXIT',Reason} -> + Reason; + _ -> + ok + end. + verify_events1([TestEv|_], [{TEH,#event{name=stop_logging,node=Node,data=_}}|_], Node, _) when element(1,TestEv) == TEH, element(2,TestEv) =/= stop_logging -> test_server:format("Failed to find ~p in the list of events!~n", [TestEv]), |