diff options
| author | Lukas Larsson <[email protected]> | 2012-03-27 15:07:01 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-03-27 15:07:01 +0200 |
| commit | c1573539fe43b1de80b35dccc18942ccf81c3c8a (patch) | |
| tree | 2fc2defec3b1682a2d351eee9ea3267910063278 /erts | |
| parent | 9d818854dd71c6bc3c6aaf8cb1bf596af7b8cf56 (diff) | |
| parent | ff53cc179325d1f1aececf357672e7abb9e7d024 (diff) | |
| download | otp-c1573539fe43b1de80b35dccc18942ccf81c3c8a.tar.gz otp-c1573539fe43b1de80b35dccc18942ccf81c3c8a.tar.bz2 otp-c1573539fe43b1de80b35dccc18942ccf81c3c8a.zip | |
Merge branch 'maint'
* maint:
Rename fin_per_testcase to end_per_testcase
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/test/erl_print_SUITE.erl | 4 | ||||
| -rw-r--r-- | erts/test/ethread_SUITE.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/erts/test/erl_print_SUITE.erl b/erts/test/erl_print_SUITE.erl index adc353bd51..165e005960 100644 --- a/erts/test/erl_print_SUITE.erl +++ b/erts/test/erl_print_SUITE.erl @@ -34,7 +34,7 @@ -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, - init_per_testcase/2, fin_per_testcase/2]). + init_per_testcase/2, end_per_testcase/2]). -export([erlang_display/1, integer/1, float/1, string/1, character/1, snprintf/1, quote/1]). @@ -247,7 +247,7 @@ init_per_testcase(Case, Config) -> Dog = ?t:timetrap(?DEFAULT_TIMEOUT), [{testcase, Case}, {watchdog, Dog} |Config]. -fin_per_testcase(_Case, Config) -> +end_per_testcase(_Case, Config) -> Dog = ?config(watchdog, Config), ?t:timetrap_cancel(Dog), ok. diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl index 5bb5aed3ed..84b08d93d5 100644 --- a/erts/test/ethread_SUITE.erl +++ b/erts/test/ethread_SUITE.erl @@ -33,7 +33,7 @@ -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, - init_per_testcase/2, fin_per_testcase/2]). + init_per_testcase/2, end_per_testcase/2]). -export([create_join_thread/1, equal_tids/1, @@ -250,7 +250,7 @@ init_per_testcase(_Case, Config) -> Dog = ?t:timetrap(?DEFAULT_TIMEOUT), [{watchdog, Dog}|Config]. -fin_per_testcase(_Case, Config) -> +end_per_testcase(_Case, Config) -> Dog = ?config(watchdog, Config), ?t:timetrap_cancel(Dog), ok. |