diff options
| author | Siri Hansen <[email protected]> | 2013-05-02 07:49:45 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-05-02 07:49:45 +0200 |
| commit | ed1bbb32e7030644e29fea79316b380a658b3605 (patch) | |
| tree | f3f486a83adfa97628bc561cd22576bdb7905316 /lib/jinterface/test/jinterface_SUITE.erl | |
| parent | 0c5dc8d7a6079706dfdf44d4abc22e756eb12863 (diff) | |
| parent | 1158dcc96c3a6a32a042bd6cc361f1c035e9cca1 (diff) | |
| download | otp-ed1bbb32e7030644e29fea79316b380a658b3605.tar.gz otp-ed1bbb32e7030644e29fea79316b380a658b3605.tar.bz2 otp-ed1bbb32e7030644e29fea79316b380a658b3605.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/jinterface/test/jinterface_SUITE.erl')
| -rw-r--r-- | lib/jinterface/test/jinterface_SUITE.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl index b438da12d0..de8d611efc 100644 --- a/lib/jinterface/test/jinterface_SUITE.erl +++ b/lib/jinterface/test/jinterface_SUITE.erl @@ -180,7 +180,7 @@ init_per_testcase(Case, _Config) Case =:= kill_mbox_from_erlang -> {skip, "Not yet implemented"}; init_per_testcase(_Case,Config) -> - Dog = ?t:timetrap({seconds,10}), + Dog = ?t:timetrap({seconds,30}), [{watch_dog,Dog}|Config]. end_per_testcase(_Case,Config) -> @@ -188,6 +188,7 @@ end_per_testcase(_Case,Config) -> undefined -> ok; Pid -> exit(Pid,kill) end, + jitu:kill_all_jnodes(), ?t:timetrap_cancel(?config(watch_dog,Config)), ok. |