aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMicael Karlberg <bmk@erlang.org>2011-06-17 12:26:48 +0200
committerMicael Karlberg <bmk@erlang.org>2011-06-17 12:26:48 +0200
commit186428028b2f53a284b32d1a63c1ce140633cb48 (patch)
treed2a051509514ca4b6f5ee16db23797161f22e027 /lib
parent90a1be0b3540af99c7bc6af6ad7bb3ebb03760d3 (diff)
downloadotp-186428028b2f53a284b32d1a63c1ce140633cb48.tar.gz
otp-186428028b2f53a284b32d1a63c1ce140633cb48.tar.bz2
otp-186428028b2f53a284b32d1a63c1ce140633cb48.zip
(httpc) test case cleanups.
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/test/httpc_SUITE.erl15
-rw-r--r--lib/inets/test/inets_test_lib.erl19
2 files changed, 19 insertions, 15 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 828fa54523..6edd5371af 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -386,14 +386,15 @@ init_per_testcase(Case, Timeout, Config) ->
init_per_testcase_ssl(Tag, PrivDir, SslConfFile, Config) ->
- tsp("init_per_testcase_ssl -> stop ssl"),
+ tsp("init_per_testcase_ssl(~w) -> stop ssl", [Tag]),
application:stop(ssl),
Config2 = lists:keydelete(local_ssl_server, 1, Config),
%% Will start inets
- tsp("init_per_testcase_ssl -> try start http server (including inets)"),
+ tsp("init_per_testcase_ssl(~w) -> try start http server (including inets)",
+ [Tag]),
Server = inets_test_lib:start_http_server(
filename:join(PrivDir, SslConfFile), Tag),
- tsp("init_per_testcase -> Server: ~p", [Server]),
+ tsp("init_per_testcase(~w) -> Server: ~p", [Tag, Server]),
[{local_ssl_server, Server} | Config2].
@@ -1169,9 +1170,9 @@ ssl_get(SslTag, Config) when is_list(Config) ->
httpc:request(get, {URL, []}, [{ssl, SSLConfig}], []),
inets_test_lib:check_body(Body);
{ok, _} ->
- {skip, "Failed to start local http-server"};
+ {skip, "local http-server not started"};
_ ->
- {skip, "Failed to start SSL"}
+ {skip, "SSL not started"}
end.
@@ -1229,9 +1230,9 @@ ssl_trace(SslTag, Config) when is_list(Config) ->
tsf({failed, Error})
end;
{ok, _} ->
- {skip, "Failed to start local http-server"};
+ {skip, "local http-server not started"};
_ ->
- {skip, "Failed to start SSL"}
+ {skip, "SSL not started"}
end.
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index eaeb244203..fe680fb35a 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -133,31 +133,34 @@ start_http_server(Conf) ->
start_http_server(Conf, ?HTTP_DEFAULT_SSL_KIND).
start_http_server(Conf, essl = _SslTag) ->
+ tsp("start_http_server(essl) -> entry - try start crypto and public_key"),
application:start(crypto),
+ application:start(public_key),
do_start_http_server(Conf);
-start_http_server(Conf, _SslTag) ->
+start_http_server(Conf, SslTag) ->
+ tsp("start_http_server(~w) -> entry", [SslTag]),
do_start_http_server(Conf).
do_start_http_server(Conf) ->
- tsp("start http server with "
+ tsp("do_start_http_server -> entry with"
"~n Conf: ~p"
"~n", [Conf]),
application:load(inets),
case application:set_env(inets, services, [{httpd, Conf}]) of
ok ->
+ tsp("start_http_server -> httpd conf stored in inets app env"),
case application:start(inets) of
ok ->
+ tsp("start_http_server -> inets started"),
ok;
Error1 ->
- test_server:format("<ERROR> Failed starting application: "
- "~n Error: ~p"
- "~n", [Error1]),
+ tsp("<ERROR> Failed starting application: "
+ "~n Error1: ~p", [Error1]),
Error1
end;
Error2 ->
- test_server:format("<ERROR> Failed set application env: "
- "~n Error: ~p"
- "~n", [Error2]),
+ tsp("<ERROR> Failed set application env: "
+ "~n Error: ~p", [Error2]),
Error2
end.