diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-08-21 14:50:14 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-08-22 17:33:25 +0200 |
| commit | dbdc87f8308a4f5c4cfa5e257923970f9a3baa83 (patch) | |
| tree | 2d3b5e170446068f327778a69619d6110bede8c3 /lib/inets/test/httpd_test_lib.erl | |
| parent | 41bb781d809effb185a857b25009615bb9acbea7 (diff) | |
| download | otp-dbdc87f8308a4f5c4cfa5e257923970f9a3baa83.tar.gz otp-dbdc87f8308a4f5c4cfa5e257923970f9a3baa83.tar.bz2 otp-dbdc87f8308a4f5c4cfa5e257923970f9a3baa83.zip | |
inets: Enable ipv6 tests for httpd
Diffstat (limited to 'lib/inets/test/httpd_test_lib.erl')
| -rw-r--r-- | lib/inets/test/httpd_test_lib.erl | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl index 36a5bb9e71..647fa6f6c1 100644 --- a/lib/inets/test/httpd_test_lib.erl +++ b/lib/inets/test/httpd_test_lib.erl @@ -91,16 +91,7 @@ verify_request(SocketType, Host, Port, Node, RequestStr, Options, TimeOut) when (is_integer(TimeOut) orelse (TimeOut =:= infinity)) -> verify_request(SocketType, Host, Port, [], Node, RequestStr, Options, TimeOut). -verify_request(SocketType, Host, Port, TranspOpts0, Node, RequestStr, Options, TimeOut) -> - %% For now, until we modernize the httpd tests - TranspOpts = - case lists:member(inet6, TranspOpts0) of - true -> - TranspOpts0; - false -> - [inet | TranspOpts0] - end, - +verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, TimeOut) -> try inets_test_lib:connect_bin(SocketType, Host, Port, TranspOpts) of {ok, Socket} -> ok = inets_test_lib:send(SocketType, Socket, RequestStr), |