diff options
| author | Lukas Larsson <[email protected]> | 2011-09-29 17:53:50 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-09-29 17:53:50 +0200 |
| commit | 1be1c1cb15068aed40a30210c8be34f36e38ed66 (patch) | |
| tree | 4abf3248faaa95f9c0fd6098ebab42074f196fd5 /erts/emulator/test/distribution_SUITE.erl | |
| parent | 0911888f960502e4ee789e82141090c31a2a83a8 (diff) | |
| parent | d41617d9969253d9e66270beebac843865036baa (diff) | |
| download | otp-1be1c1cb15068aed40a30210c8be34f36e38ed66.tar.gz otp-1be1c1cb15068aed40a30210c8be34f36e38ed66.tar.bz2 otp-1be1c1cb15068aed40a30210c8be34f36e38ed66.zip | |
Merge branch 'lukas/fix_erts_testcases/OTP-9596' into dev
* lukas/fix_erts_testcases/OTP-9596:
Skip create_big_boot on platforms without crypto
Remove test_server path instead of cwd for clash test
Skip getaddr_v6 test if on the ipv4_only host
Use static port for old solaris versions
Extend time to wait for zone files to be loaded
Allow out of memory exception for max_port checks
Extend slave start timeout for windows tests
Double timeout to make sure debug builds pass
Use now instead of os:timestamp
Increase timeout in scheduler_suspend for slow platforms
Skip update_cpu_info if 'taskset' cannot be found
Diffstat (limited to 'erts/emulator/test/distribution_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/distribution_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl index 3eaacdb044..19281f6d58 100644 --- a/erts/emulator/test/distribution_SUITE.erl +++ b/erts/emulator/test/distribution_SUITE.erl @@ -336,7 +336,7 @@ receiver2(Num, TotSize) -> link_to_busy(doc) -> "Test that link/1 to a busy distribution port works."; link_to_busy(Config) when is_list(Config) -> - ?line Dog = test_server:timetrap(test_server:seconds(30)), + ?line Dog = test_server:timetrap(test_server:seconds(60)), ?line {ok, Node} = start_node(link_to_busy), ?line Recv = spawn(Node, erlang, apply, [fun sink/1, [link_to_busy_sink]]), @@ -383,7 +383,7 @@ tail_applied_linker(Pid) -> exit_to_busy(doc) -> "Test that exit/2 to a busy distribution port works."; exit_to_busy(Config) when is_list(Config) -> - ?line Dog = test_server:timetrap(test_server:seconds(30)), + ?line Dog = test_server:timetrap(test_server:seconds(60)), ?line {ok, Node} = start_node(exit_to_busy), Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of |