diff options
| author | Siri Hansen <[email protected]> | 2014-04-22 12:10:51 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-04-22 12:10:51 +0200 |
| commit | 5ce2b6588eb2a237e757265a83de28d997a13c3d (patch) | |
| tree | 0402898c0e421634af657322bf1e6f4e5f576724 /lib/reltool/test/reltool_test_lib.erl | |
| parent | ed1c35ea483db86d208335f43565026b12c426d6 (diff) | |
| parent | 710a1fa0c47eb7bfd1047bb6f8538c8a0fd20e62 (diff) | |
| download | otp-5ce2b6588eb2a237e757265a83de28d997a13c3d.tar.gz otp-5ce2b6588eb2a237e757265a83de28d997a13c3d.tar.bz2 otp-5ce2b6588eb2a237e757265a83de28d997a13c3d.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[reltool] Adapt tests to better quoting of paths on windows
[reltool] Increase timetrap timeout to handle slow test machines
Skip test when needed applications are missing
Don't allow slave nodes to survive their test case
Diffstat (limited to 'lib/reltool/test/reltool_test_lib.erl')
| -rw-r--r-- | lib/reltool/test/reltool_test_lib.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl index 530d0a9985..fa12f19aa7 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-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2014. 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 @@ -20,12 +20,13 @@ -compile(export_all). -include("reltool_test_lib.hrl"). +-define(timeout, 20). % minutes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% init_per_suite(Config) when is_list(Config)-> global:register_name(reltool_global_logger, group_leader()), - incr_timetrap(Config, 10). + incr_timetrap(Config, ?timeout). end_per_suite(Config) when is_list(Config)-> global:unregister_name(reltool_global_logger), @@ -51,7 +52,7 @@ set_kill_timer(Config) -> Time = case lookup_config(tc_timeout, Config) of [] -> - timer:minutes(10); + timer:minutes(?timeout); ConfigTime when is_integer(ConfigTime) -> ConfigTime end, |