diff options
| author | Erlang/OTP <[email protected]> | 2016-05-03 10:10:52 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-05-03 10:10:52 +0200 |
| commit | 5cb58c72225de9e7c15d5adcaccff99f093d6543 (patch) | |
| tree | 95d14c28dd06c466a712958ae50abfdf1ec65efb /lib/common_test/src | |
| parent | fea24ae8d37b33e97ef1897d0d3b6cdb2338c051 (diff) | |
| parent | f9efac8ec3dd32c23f02b12e17e0597785cbec52 (diff) | |
| download | otp-5cb58c72225de9e7c15d5adcaccff99f093d6543.tar.gz otp-5cb58c72225de9e7c15d5adcaccff99f093d6543.tar.bz2 otp-5cb58c72225de9e7c15d5adcaccff99f093d6543.zip | |
Merge branch 'zandra/cth_surefire-bug/OTP-13513' into maint-18
* zandra/cth_surefire-bug/OTP-13513:
add testcase for the surefire hook bug
fix cht_surefire bug when pre_init_per_suite fails
Diffstat (limited to 'lib/common_test/src')
| -rw-r--r-- | lib/common_test/src/cth_surefire.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl index 31a8e1c076..d6e855c02c 100644 --- a/lib/common_test/src/cth_surefire.erl +++ b/lib/common_test/src/cth_surefire.erl @@ -82,7 +82,8 @@ init(Path, Opts) -> url_base = proplists:get_value(url_base,Opts), timer = ?now }. -pre_init_per_suite(Suite,SkipOrFail,State) when is_tuple(SkipOrFail) -> +pre_init_per_suite(Suite,SkipOrFail,#state{ test_cases = [] } = State) + when is_tuple(SkipOrFail) -> {SkipOrFail, init_tc(State#state{curr_suite = Suite, curr_suite_ts = ?now}, SkipOrFail) }; |