diff options
| author | Peter Andersson <[email protected]> | 2011-04-19 23:25:12 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-04-28 22:45:58 +0200 |
| commit | 0197acace48c17dcb500b7bdb10d2cc1cbaa848e (patch) | |
| tree | db8cbd8253a578c70eacb1001964b449cc2e9e53 /lib/test_server/src/test_server_sup.erl | |
| parent | 0634077b636eb0c879e1f71ba78ea1565b6617b2 (diff) | |
| download | otp-0197acace48c17dcb500b7bdb10d2cc1cbaa848e.tar.gz otp-0197acace48c17dcb500b7bdb10d2cc1cbaa848e.tar.bz2 otp-0197acace48c17dcb500b7bdb10d2cc1cbaa848e.zip | |
Fix problems with timetrap handling in common_test:
1. ct:timetrap(infinity) not supported.
2. Previous set timetrap for a test case is not cancelled by new one.
Diffstat (limited to 'lib/test_server/src/test_server_sup.erl')
| -rw-r--r-- | lib/test_server/src/test_server_sup.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl index 1a614d74d5..53dfb45e3a 100644 --- a/lib/test_server/src/test_server_sup.erl +++ b/lib/test_server/src/test_server_sup.erl @@ -83,13 +83,13 @@ timetrap(Timeout0, Scale, Pid) -> %% Handle = term() %% %% Cancels a time trap. - timetrap_cancel(Handle) -> unlink(Handle), MonRef = erlang:monitor(process, Handle), exit(Handle, kill), receive {'DOWN',MonRef,_,_,_} -> ok after 2000 -> ok end. + capture_get(Msgs) -> receive {captured,Msg} -> |