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/old_httpd_SUITE.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/old_httpd_SUITE.erl')
| -rw-r--r-- | lib/inets/test/old_httpd_SUITE.erl | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/lib/inets/test/old_httpd_SUITE.erl b/lib/inets/test/old_httpd_SUITE.erl index 3e1a1a3845..19c2bc129e 100644 --- a/lib/inets/test/old_httpd_SUITE.erl +++ b/lib/inets/test/old_httpd_SUITE.erl @@ -182,22 +182,24 @@ groups() -> %% ip_load_medium, %% ip_load_heavy, %%ip_dos_hostname, - ip_time_test - %% Replaced by load_config - %% ip_restart_no_block, - %% ip_restart_disturbing_block, - %% ip_restart_non_disturbing_block, - %% ip_block_disturbing_idle, - %% ip_block_non_disturbing_idle, - %% ip_block_503, - %% ip_block_disturbing_active, - %% ip_block_non_disturbing_active, - %% ip_block_disturbing_active_timeout_not_released, - %% ip_block_disturbing_active_timeout_released, - %% ip_block_non_disturbing_active_timeout_not_released, - %% ip_block_non_disturbing_active_timeout_released, - %% ip_block_disturbing_blocker_dies, - %% ip_block_non_disturbing_blocker_dies + ip_time_test, + %% Only used through load_config + %% but we still need these tests + %% should be cleaned up and moved to new test suite + ip_restart_no_block, + ip_restart_disturbing_block, + ip_restart_non_disturbing_block, + ip_block_disturbing_idle, + ip_block_non_disturbing_idle, + ip_block_503, + ip_block_disturbing_active, + ip_block_non_disturbing_active, + ip_block_disturbing_active_timeout_not_released, + ip_block_disturbing_active_timeout_released, + ip_block_non_disturbing_active_timeout_not_released, + ip_block_non_disturbing_active_timeout_released, + ip_block_disturbing_blocker_dies, + ip_block_non_disturbing_blocker_dies ]}, {ssl, [], [{group, essl}]}, {essl, [], |