diff options
| author | Erlang/OTP <[email protected]> | 2014-05-27 13:42:13 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-05-27 13:42:13 +0200 |
| commit | ed485d3bcba0aefaa5cb7e489a8438e3c012a99a (patch) | |
| tree | e3f2e83c33ef2424631e88a59261ca7b634d8855 /lib/inets/test/httpd_block.erl | |
| parent | 9e19d1bf9fc7dc322823327e5e78f4ec0c3cee37 (diff) | |
| parent | 622fd3c35bd277353374adc45b18839f7ca988f3 (diff) | |
| download | otp-ed485d3bcba0aefaa5cb7e489a8438e3c012a99a.tar.gz otp-ed485d3bcba0aefaa5cb7e489a8438e3c012a99a.tar.bz2 otp-ed485d3bcba0aefaa5cb7e489a8438e3c012a99a.zip | |
Merge branch 'ia/inets/block-unblock/OTP-11914' into maint-17
* ia/inets/block-unblock/OTP-11914:
inets: Correct distirbing mode for httpd:reload_config/2
Diffstat (limited to 'lib/inets/test/httpd_block.erl')
| -rw-r--r-- | lib/inets/test/httpd_block.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/inets/test/httpd_block.erl b/lib/inets/test/httpd_block.erl index 706d014bda..9790623b6f 100644 --- a/lib/inets/test/httpd_block.erl +++ b/lib/inets/test/httpd_block.erl @@ -111,8 +111,7 @@ block_disturbing_active_timeout_not_released(Type, Port, Host, Node) -> process_flag(trap_exit, true), Poller = long_poll(Type, Host, Port, Node, 200, 60000), ct:sleep(15000), - Blocker = blocker(Node, Host, Port, 50000), - await_normal_process_exit(Blocker, "blocker", 50000), + ok = httpd_block(undefined, Port, disturbing, 50000), await_normal_process_exit(Poller, "poller", 30000), blocked = get_admin_state(Node, Host, Port), process_flag(trap_exit, false), @@ -123,8 +122,7 @@ block_disturbing_active_timeout_released(Type, Port, Host, Node) -> process_flag(trap_exit, true), Poller = long_poll(Type, Host, Port, Node, 200, 40000), ct:sleep(5000), - Blocker = blocker(Node, Host, Port, 10000), - await_normal_process_exit(Blocker, "blocker", 15000), + ok = httpd_block(undefined, Port, disturbing, 10000), await_suite_failed_process_exit(Poller, "poller", 40000, connection_closed), blocked = get_admin_state(Node, Host, Port), |