diff options
| author | Siri Hansen <[email protected]> | 2013-04-30 15:58:21 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-04-30 15:58:21 +0200 |
| commit | 1158dcc96c3a6a32a042bd6cc361f1c035e9cca1 (patch) | |
| tree | 31c9913293fe3f43a73d91fa67afa13bbe561372 /lib/jinterface/test/jinterface_SUITE.erl | |
| parent | d93043ca0839e659abada62b0c6cf4d441808acf (diff) | |
| parent | a7c002d0f70526257fcf07d7a4b7320d541da931 (diff) | |
| download | otp-1158dcc96c3a6a32a042bd6cc361f1c035e9cca1.tar.gz otp-1158dcc96c3a6a32a042bd6cc361f1c035e9cca1.tar.bz2 otp-1158dcc96c3a6a32a042bd6cc361f1c035e9cca1.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[jinterface] Extend timetrap timers in nc_SUITE and jinterface_SUITE
[jinterface] Set max heap size for jvm when running echo_server
[jinterface] Clean up hanging java nodes after each test case
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. |