diff options
| author | Micael Karlberg <[email protected]> | 2012-02-08 12:52:26 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-02-08 12:52:26 +0100 |
| commit | 3f89830e526e4fb7556c8a9fb79859fbd85756ac (patch) | |
| tree | 2b35e01bf5af4d948a72639251beae9157972130 /lib/inets/test/httpc_SUITE.erl | |
| parent | 9a8b3a5c58a2f688aaae1135bf71c6148f27aa7e (diff) | |
| download | otp-3f89830e526e4fb7556c8a9fb79859fbd85756ac.tar.gz otp-3f89830e526e4fb7556c8a9fb79859fbd85756ac.tar.bz2 otp-3f89830e526e4fb7556c8a9fb79859fbd85756ac.zip | |
[inets] Force use of IPv4 for all non-IPv6 cases
Diffstat (limited to 'lib/inets/test/httpc_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index 734964698e..9bbd957473 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2011. All Rights Reserved. +%% Copyright Ericsson AB 2004-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -375,6 +375,7 @@ init_per_testcase(Case, Timeout, Config) -> TmpConfig2 = lists:keydelete(local_server, 1, TmpConfig), %% Will start inets + tsp("init_per_testcase -> try start server"), Server = start_http_server(PrivDir, IpConfFile), [{watchdog, Dog}, {local_server, Server} | TmpConfig2] end, @@ -3298,7 +3299,10 @@ create_config(FileName, ComType, Port, PrivDir, ServerRoot, DocRoot, " mod_include mod_dir mod_get mod_head" " mod_log mod_disk_log mod_trace", + BindAddress = "*|inet", + HttpConfig = [ + cline(["BindAddress ", BindAddress]), cline(["Port ", integer_to_list(Port)]), cline(["ServerName ", "httpc_test"]), cline(["SocketType ", atom_to_list(ComType)]), @@ -3895,9 +3899,9 @@ p(F, A) -> io:format("~p ~w:" ++ F ++ "~n", [self(), ?MODULE | A]). tsp(F) -> - inets_test_lib:tsp(F). + inets_test_lib:tsp("[~w]" ++ F, [?MODULE]). tsp(F, A) -> - inets_test_lib:tsp(F, A). + inets_test_lib:tsp("[~w]" ++ F, [?MODULE|A]). tsf(Reason) -> test_server:fail(Reason). |