diff options
| author | Siri Hansen <[email protected]> | 2017-03-06 08:52:34 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-03-06 08:52:34 +0100 |
| commit | ff965ce109ea10ec69bbac47b3a3f9b51c43f236 (patch) | |
| tree | f97628a75d7303ff334b2ca40bc43ca2103587a2 /lib/common_test/src/test_server.erl | |
| parent | b14e556b334069ca60b1be1a1ed45374daf8e1fc (diff) | |
| parent | 0e0155410734e04556ceecb1222dd2ef956b4177 (diff) | |
| download | otp-ff965ce109ea10ec69bbac47b3a3f9b51c43f236.tar.gz otp-ff965ce109ea10ec69bbac47b3a3f9b51c43f236.tar.bz2 otp-ff965ce109ea10ec69bbac47b3a3f9b51c43f236.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/test_server.erl')
| -rw-r--r-- | lib/common_test/src/test_server.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl index 924086f2bd..be49191f2e 100644 --- a/lib/common_test/src/test_server.erl +++ b/lib/common_test/src/test_server.erl @@ -778,9 +778,9 @@ spawn_fw_call(Mod,IPTC={init_per_testcase,Func},CurrConf,Pid, %% if init_per_testcase fails, the test case %% should be skipped try begin do_end_tc_call(Mod,IPTC, {Pid,Skip,[CurrConf]}, Why), - do_init_tc_call(Mod,{end_per_testcase,Func}, + do_init_tc_call(Mod,{end_per_testcase_not_run,Func}, [CurrConf],{ok,[CurrConf]}), - do_end_tc_call(Mod,{end_per_testcase,Func}, + do_end_tc_call(Mod,{end_per_testcase_not_run,Func}, {Pid,Skip,[CurrConf]}, Why) end of _ -> ok catch @@ -1151,14 +1151,14 @@ do_end_tc_call(Mod, IPTC={init_per_testcase,Func}, Res, Return) -> Args end, EPTCInitRes = - case do_init_tc_call(Mod,{end_per_testcase,Func}, + case do_init_tc_call(Mod,{end_per_testcase_not_run,Func}, IPTCEndRes,Return) of {ok,EPTCInitConfig} when is_list(EPTCInitConfig) -> {Return,EPTCInitConfig}; _ -> - Return + {Return,IPTCEndRes} end, - do_end_tc_call1(Mod, {end_per_testcase,Func}, + do_end_tc_call1(Mod, {end_per_testcase_not_run,Func}, EPTCInitRes, Return); _Ok -> do_end_tc_call1(Mod, IPTC, Res, Return) |