diff options
author | Micael Karlberg <bmk@erlang.org> | 2011-12-22 12:00:55 +0100 |
---|---|---|
committer | Micael Karlberg <bmk@erlang.org> | 2012-02-06 12:31:58 +0100 |
commit | 0d580acdc51bd88a0d364b76ac35fcf2506c2d9e (patch) | |
tree | eca18e4c62f62ecd5032538ea81293921e3e7601 /lib/inets/test/httpd_mod.erl | |
parent | 67b0023a0756c69f58a40702ed9a808e1e5a66a7 (diff) | |
download | erlang-0d580acdc51bd88a0d364b76ac35fcf2506c2d9e.tar.gz |
[inets] Improved test util error handling when copy dirs
Copy dirs failed for some cases, so added more info when
that happens. Also added more info during httpd test case
init.
Diffstat (limited to 'lib/inets/test/httpd_mod.erl')
-rw-r--r-- | lib/inets/test/httpd_mod.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl index 6ba0624210..25a03ab9c8 100644 --- a/lib/inets/test/httpd_mod.erl +++ b/lib/inets/test/httpd_mod.erl @@ -47,16 +47,15 @@ alias(Type, Port, Host, Node) -> %% "~n", [?MODULE, Type, Port, Host, Node]), %% This is very crude, but... - io:format(user, - "alias -> Has IPv6 support: ~p", - [inets_test_lib:has_ipv6_support()]), + tsp("alias -> Has IPv6 support: ~p", [inets_test_lib:has_ipv6_support()]), Opts = case os:type() of {win32, _} -> [inet6fb4]; _ -> [] end, - + tsp("alias -> Opts: ~p", [Opts]), + ok = httpd_test_lib:verify_request(Type, Host, Port, Opts, Node, "GET /pics/icon.sheet.gif " "HTTP/1.0\r\n\r\n", @@ -1043,9 +1042,10 @@ check_lists_members1(L1,L2) -> %% tsp(F) -> -%% tsp(F, []). -%% tsp(F, A) -> -%% test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]). +%% inets_test_lib:tsp(F). +tsp(F, A) -> + inets_test_lib:tsp(F, A). + tsf(Reason) -> test_server:fail(Reason). |