diff options
author | Ingela Anderton Andin <[email protected]> | 2016-04-29 17:25:36 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-05-23 18:21:11 +0200 |
commit | 7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9 (patch) | |
tree | 62e5c69bde3ff611d4da725939a50a04673d20de /lib/inets/test/httpd_block.erl | |
parent | c8cd6f30021d5f28e06d89a6acf834d770b9e972 (diff) | |
download | otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.tar.gz otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.tar.bz2 otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.zip |
inets: Use test_server app tests and remove legacy test_server code
FTP tests needed some refactoring as some tests where lost to
the ftp_suite_lib module that was not run.
Diffstat (limited to 'lib/inets/test/httpd_block.erl')
-rw-r--r-- | lib/inets/test/httpd_block.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/test/httpd_block.erl b/lib/inets/test/httpd_block.erl index 44f6f644ad..45547e6d4e 100644 --- a/lib/inets/test/httpd_block.erl +++ b/lib/inets/test/httpd_block.erl @@ -133,7 +133,7 @@ block_disturbing_active_timeout_released(Type, Port, Host, Node) -> block_non_disturbing_active_timeout_not_released(Type, Port, Host, Node) -> process_flag(trap_exit, true), Poller = long_poll(Type, Host, Port, Node, 200, 60000), - test_server:sleep(5000), + ct:sleep(5000), ok = block_nd_server(Node, Host, Port, 40000), await_normal_process_exit(Poller, "poller", 60000), blocked = get_admin_state(Node, Host, Port), |