diff options
| author | Siri Hansen <[email protected]> | 2013-03-14 10:57:39 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-03-14 10:57:39 +0100 |
| commit | e2ee1f79a7d0ffe02eab4da90d655e77893d1666 (patch) | |
| tree | aff42174e9798e056e9f34c2c57b77649a0b9a9d /lib/reltool/test/reltool_test_lib.erl | |
| parent | e5df75bfc94662ffe9c36e0b1643cef0104586e0 (diff) | |
| parent | 0541bbab72df88b91d5725ad209aef1a951a4448 (diff) | |
| download | otp-e2ee1f79a7d0ffe02eab4da90d655e77893d1666.tar.gz otp-e2ee1f79a7d0ffe02eab4da90d655e77893d1666.tar.bz2 otp-e2ee1f79a7d0ffe02eab4da90d655e77893d1666.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[sasl] Fix tests that compare execution time
[jinterface] Kill process between tests to avoid consequential error
[jinterface] Make tests handle space in path on windows
[common_test] Extend timers for slave nodes in ct_cover_SUITE
[test_server] Clean up unused code in test_server_SUITE
[reltool] Increase timetrap timeout for reltool_server_SUTIE to 10 minutes
[test_server] Fix encoding of HTML file references to work on windows
[test_server] Use simpler tc name in unicode test to make it work on windows
Diffstat (limited to 'lib/reltool/test/reltool_test_lib.erl')
| -rw-r--r-- | lib/reltool/test/reltool_test_lib.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl index 61f783190c..3485365ed9 100644 --- a/lib/reltool/test/reltool_test_lib.erl +++ b/lib/reltool/test/reltool_test_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2012. All Rights Reserved. +%% Copyright Ericsson AB 2009-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -25,7 +25,7 @@ init_per_suite(Config) when is_list(Config)-> global:register_name(reltool_global_logger, group_leader()), - incr_timetrap(Config, 5). + incr_timetrap(Config, 10). end_per_suite(Config) when is_list(Config)-> global:unregister_name(reltool_global_logger), @@ -51,7 +51,7 @@ set_kill_timer(Config) -> Time = case lookup_config(tc_timeout, Config) of [] -> - timer:minutes(5); + timer:minutes(10); ConfigTime when is_integer(ConfigTime) -> ConfigTime end, |