diff options
| author | Siri Hansen <[email protected]> | 2013-01-23 16:28:19 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-01-23 16:28:19 +0100 |
| commit | f5170af4a992d6de5cd84da9cc4db4b4e073de32 (patch) | |
| tree | b7552d19bfe301a10e23ff031a2c30b0ea5655ab /lib/common_test/test/ct_master_SUITE.erl | |
| parent | d0809964a228c6314a5bb8b5872114a0ab9ec65e (diff) | |
| parent | 4aa7be58e6c1e7031042e7ea7b008de1cf4c0ad6 (diff) | |
| download | otp-f5170af4a992d6de5cd84da9cc4db4b4e073de32.tar.gz otp-f5170af4a992d6de5cd84da9cc4db4b4e073de32.tar.bz2 otp-f5170af4a992d6de5cd84da9cc4db4b4e073de32.zip | |
Merge branch 'siri/common_test/minor_test_fixes/OTP-10483'
* siri/common_test/minor_test_fixes/OTP-10483:
[common_test] Extend timetrap time in ct_hooks_SUITE
[common_test] Avoid hanging ct@host node if crypto does not exist
[common_test] Changed call to publick_key to use documented interface
[common_test] Extend timeout values for slave nodes in ct_master_SUITE
[common_test] Extend valid interval for approximate timer values in tests
Diffstat (limited to 'lib/common_test/test/ct_master_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_master_SUITE.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl index 56a343a96f..b89d7d4dc5 100644 --- a/lib/common_test/test/ct_master_SUITE.erl +++ b/lib/common_test/test/ct_master_SUITE.erl @@ -154,6 +154,9 @@ make_spec(DataDir, FileName, NodeNames, Suites, Config) -> {init,NodeName,[ {node_start,[{startup_functions,[]}, {monitor_master,true}, + {boot_timeout,10}, + {init_timeout,10}, + {startup_timeout,10}, {env,Env}]}, {eval,{erlang,nodes,[]}}] } |