Merge branch 'maint'

3 files changed, 20 insertions, 119 deletions

diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index cf28f5a245..60979278fc 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -77,75 +77,32 @@ end_per_suite(_) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_testcase(httpd_subtree, Config) ->
-    io:format("init_per_testcase(httpd_subtree) -> entry with"
-	      "~n   Config: ~p"
-	      "~n", [Config]),
     Dog = test_server:timetrap(?t:minutes(1)),
     NewConfig = lists:keydelete(watchdog, 1, Config),
-
-    DataDir = ?config(data_dir, Config), 
     PrivDir = ?config(priv_dir, Config), 			   
-    ServerROOT = filename:join(PrivDir, "server_root"),
-    DocROOT = filename:join(PrivDir, "htdocs"),
-    ConfDir = filename:join(ServerROOT, "conf"),
-
-    io:format("init_per_testcase(httpd_subtree) -> create dir(s)"
-	      "~n", []),
-    file:make_dir(ServerROOT), %% until http_test is cleaned up!
-    ok = file:make_dir(DocROOT),
-    ok = file:make_dir(ConfDir),    
-
-    io:format("init_per_testcase(httpd_subtree) -> copy file(s)"
-	      "~n", []),
-    {ok, _} = inets_test_lib:copy_file("simple.conf", DataDir, PrivDir),
-    {ok, _} = inets_test_lib:copy_file("mime.types", DataDir, ConfDir),
-    
-    io:format("init_per_testcase(httpd_subtree) -> write file(s)"
-	      "~n", []),
-    ConfFile = filename:join(PrivDir, "simple.conf"),
-    {ok, Fd} = file:open(ConfFile, [append]),
-    ok = file:write(Fd, "ServerRoot " ++ ServerROOT ++ "\n"),
-    ok = file:write(Fd, "DocumentRoot " ++ DocROOT ++ "\n"),
-    ok = file:close(Fd),
-    
-    %% To make sure application:set_env is not overwritten by any
-    %% app-file settings.
-    io:format("init_per_testcase(httpd_subtree) -> load inets app"
-	      "~n", []),
-    application:load(inets),
-    io:format("init_per_testcase(httpd_subtree) -> update inets env"
-	      "~n", []),
-    ok = application:set_env(inets, services, [{httpd, ConfFile}]),
-    
+   
+    SimpleConfig  = [{port, 0},
+		     {server_name,"www.test"},
+		     {modules, [mod_get]},
+		     {server_root, PrivDir},
+		     {document_root, PrivDir},
+		     {bind_address, any},
+		     {ipfamily, inet}],
     try
-	io:format("init_per_testcase(httpd_subtree) -> start inets app"
-		  "~n", []),
-	ok = inets:start(),
-	io:format("init_per_testcase(httpd_subtree) -> done"
-		  "~n", []),
-	[{watchdog, Dog}, {server_root, ServerROOT}, {doc_root, DocROOT},
-	 {conf_dir, ConfDir}| NewConfig]
+	inets:start(),
+	inets:start(httpd, SimpleConfig),
+	[{watchdog, Dog} | NewConfig]
     catch
 	_:Reason ->
-	    io:format("init_per_testcase(httpd_subtree) -> "
-		      "failed starting inets - cleanup"
-		      "~n   Reason: ~p"
-		      "~n", [Reason]),
-	    application:unset_env(inets, services),
-	    application:unload(inets),
+	    inets:stop(),
 	    exit({failed_starting_inets, Reason})
     end;
     
 
-init_per_testcase(Case, Config) ->
-    io:format("init_per_testcase(~p) -> entry with"
-	      "~n   Config: ~p"
-	      "~n", [Case, Config]),
+init_per_testcase(_Case, Config) ->
     Dog = test_server:timetrap(?t:minutes(5)),
     NewConfig = lists:keydelete(watchdog, 1, Config),
-    Stop = inets:stop(),
-    io:format("init_per_testcase(~p) -> Stop: ~p"
-	      "~n", [Case, Stop]),
+    inets:stop(),
     ok = inets:start(),
     [{watchdog, Dog} | NewConfig].
 
@@ -280,30 +237,21 @@ httpd_subtree(doc) ->
 httpd_subtree(suite) ->
     [];
 httpd_subtree(Config) when is_list(Config) ->
-    io:format("httpd_subtree -> entry with"
-	      "~n   Config: ~p"
-	      "~n", [Config]),
-
     %% Check that we have the httpd top supervisor
-    io:format("httpd_subtree -> verify inets~n", []),
     {ok, _} = verify_child(inets_sup, httpd_sup, supervisor),
 
     %% Check that we have the httpd instance supervisor
-    io:format("httpd_subtree -> verify httpd~n", []),
     {ok, Id} = verify_child(httpd_sup, httpd_instance_sup, supervisor),
     {httpd_instance_sup, Addr, Port} = Id,
     Instance = httpd_util:make_name("httpd_instance_sup", Addr, Port),
     
     %% Check that we have the expected httpd instance children
-    io:format("httpd_subtree -> verify httpd instance children "
-	      "(acceptor, misc and manager)~n", []),
     {ok, _} = verify_child(Instance, httpd_connection_sup, supervisor),
     {ok, _} = verify_child(Instance, httpd_acceptor_sup, supervisor),
     {ok, _} = verify_child(Instance, httpd_misc_sup, supervisor),
     {ok, _} = verify_child(Instance, httpd_manager, worker),
 
     %% Check that the httpd instance acc supervisor has children
-    io:format("httpd_subtree -> verify acc~n", []),
     InstanceAcc = httpd_util:make_name("httpd_acceptor_sup", Addr, Port),
     case supervisor:which_children(InstanceAcc) of
 	[_ | _] -> 
@@ -328,15 +276,7 @@ httpd_subtree(Config) when is_list(Config) ->
 
 
 verify_child(Parent, Child, Type) ->
-%%     io:format("verify_child -> entry with"
-%% 	      "~n   Parent: ~p"
-%% 	      "~n   Child:  ~p"
-%% 	      "~n   Type:   ~p"
-%% 	      "~n", [Parent, Child, Type]),
     Children = supervisor:which_children(Parent),
-%%     io:format("verify_child -> which children"
-%% 	      "~n   Children:   ~p"
-%% 	      "~n", [Children]),
     verify_child(Children, Parent, Child, Type).
 
 verify_child([], Parent, Child, _Type) ->
@@ -344,21 +284,12 @@ verify_child([], Parent, Child, _Type) ->
 verify_child([{Id, _Pid, Type2, Mods}|Children], Parent, Child, Type) ->
     case lists:member(Child, Mods) of
 	true when (Type2 =:= Type) ->
-%% 	    io:format("verify_child -> found with expected type"
-%% 		      "~n   Id: ~p"
-%% 		      "~n", [Id]),
 	    {ok, Id};
 	true when (Type2 =/= Type) ->
-%% 	    io:format("verify_child -> found with unexpected type"
-%% 		      "~n   Type2: ~p"
-%% 		      "~n   Id:    ~p"
-%% 		      "~n", [Type2, Id]),
 	    {error, {wrong_type, Type2, Child, Parent}};
 	false ->
 	    verify_child(Children, Parent, Child, Type)
     end.
-					  
-
 
 %%-------------------------------------------------------------------------
 %% httpc_subtree
@@ -368,40 +299,19 @@ httpc_subtree(doc) ->
 httpc_subtree(suite) ->
     [];
 httpc_subtree(Config) when is_list(Config) ->
-    tsp("httpc_subtree -> entry with"
-	"~n   Config: ~p", [Config]),
+    {ok, Foo} = inets:start(httpc, [{profile, foo}]),
 
-    tsp("httpc_subtree -> start inets service httpc with profile foo"),
-    {ok, _Foo} = inets:start(httpc, [{profile, foo}]),
+    {ok, Bar} = inets:start(httpc, [{profile, bar}], stand_alone),
 
-    tsp("httpc_subtree -> "
-	"start stand-alone inets service httpc with profile bar"),
-    {ok, _Bar} = inets:start(httpc, [{profile, bar}], stand_alone),
-
-    tsp("httpc_subtree -> retreive list of httpc instances"),
     HttpcChildren = supervisor:which_children(httpc_profile_sup),
-    tsp("httpc_subtree -> HttpcChildren: ~n~p", [HttpcChildren]),
-    
-    tsp("httpc_subtree -> verify httpc stand-alone instances"),
+
     {value, {httpc_manager, _, worker, [httpc_manager]}} =
 	lists:keysearch(httpc_manager, 1, HttpcChildren),
 
-    tsp("httpc_subtree -> verify httpc (named) instances"),
-    {value,{{httpc,foo}, Pid, worker, [httpc_manager]}} = 
+    {value,{{httpc,foo}, _Pid, worker, [httpc_manager]}} = 
 	lists:keysearch({httpc, foo}, 1, HttpcChildren),
     false = lists:keysearch({httpc, bar}, 1, HttpcChildren),
     
-    tsp("httpc_subtree -> stop inets"),
-    inets:stop(httpc, Pid),
-
-    tsp("httpc_subtree -> done"),
-    ok.
-
-tsp(F) ->
-    tsp(F, []).
-tsp(F, A) ->
-    test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
-
-tsf(Reason) ->
-    test_server:fail(Reason).
+    inets:stop(httpc, Foo),
+    exit(Bar, normal).
 
diff --git a/lib/inets/test/inets_sup_SUITE_data/mime.types b/lib/inets/test/inets_sup_SUITE_data/mime.types
deleted file mode 100644
index e52d345ff7..0000000000
--- a/lib/inets/test/inets_sup_SUITE_data/mime.types
+++ /dev/null
@@ -1,3 +0,0 @@
-# MIME type			Extension
-text/html			html htm
-text/plain			asc txt
diff --git a/lib/inets/test/inets_sup_SUITE_data/simple.conf b/lib/inets/test/inets_sup_SUITE_data/simple.conf
deleted file mode 100644
index e1429b4a28..0000000000
--- a/lib/inets/test/inets_sup_SUITE_data/simple.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Port 8888
-ServerName www.test
-SocketType ip_comm
-Modules mod_get 
-ServerAdmin [email protected]
-