diff options
| author | Patrik Nyblom <[email protected]> | 2010-09-13 10:52:43 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-09-13 10:52:43 +0200 |
| commit | 525fd7b044e78ae54527af6b0a21a2c7d49f78c9 (patch) | |
| tree | 9e6a833aa20a436a3e2a2ffa99a4ff60f49db7fb /erts/emulator/test/port_SUITE.erl | |
| parent | e5f1c776df55a965f2f61d9881f17c8bf32e8621 (diff) | |
| parent | d9ad7fc091e850d9484e3f1fdf9ede22f9a18e04 (diff) | |
| download | otp-525fd7b044e78ae54527af6b0a21a2c7d49f78c9.tar.gz otp-525fd7b044e78ae54527af6b0a21a2c7d49f78c9.tar.bz2 otp-525fd7b044e78ae54527af6b0a21a2c7d49f78c9.zip | |
Merge branch 'pan/windows-testcases/OTP-8820' into dev
* pan/windows-testcases/OTP-8820:
Teach Winsock initialization to be thread safe
Make ei_threaded_send synchronized
Increase timeout value in ei_accept_SUITE
Teach ei_accept_SUITE to wait for node publish instead of using random sleeps
Teach port suite to not use unix-specific commands and not leave them running
Add line macros to gen_udp_SUITE:connect
Diffstat (limited to 'erts/emulator/test/port_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/port_SUITE.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl index 77fa75b78f..a7476ca9bb 100644 --- a/erts/emulator/test/port_SUITE.erl +++ b/erts/emulator/test/port_SUITE.erl @@ -2305,7 +2305,11 @@ load_driver(Dir, Driver) -> close_deaf_port(doc) -> ["Send data to port program that does not read it, then close port."]; close_deaf_port(suite) -> []; close_deaf_port(Config) when is_list(Config) -> - Port = open_port({spawn,"sleep 999999"},[]), - erlang:port_command(Port,"Hello, can you hear me!?!?"), - port_close(Port), + ?line Dog = test_server:timetrap(test_server:seconds(100)), + ?line DataDir = ?config(data_dir, Config), + ?line DeadPort = os:find_executable("dead_port", DataDir), + + ?line Port = open_port({spawn,DeadPort++" 60"},[]), + ?line erlang:port_command(Port,"Hello, can you hear me!?!?"), + ?line port_close(Port), ok. |