aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-12-21 14:32:55 +0100
committerMicael Karlberg <[email protected]>2012-02-06 12:31:58 +0100
commit67b0023a0756c69f58a40702ed9a808e1e5a66a7 (patch)
tree6bcf034213fed3c705fedec33ffe7b92967e5abd /lib
parent8d6b47823001de84b09062baee10b7ed7e3f8864 (diff)
downloadotp-67b0023a0756c69f58a40702ed9a808e1e5a66a7.tar.gz
otp-67b0023a0756c69f58a40702ed9a808e1e5a66a7.tar.bz2
otp-67b0023a0756c69f58a40702ed9a808e1e5a66a7.zip
[inets] System Info printouts in test suite
Moved the System Info printout to the init_per_suite function for the httpc suite. Added it to the same function for the httpd suite.
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/test/httpc_SUITE.erl10
-rw-r--r--lib/inets/test/httpd_SUITE.erl2
-rw-r--r--lib/inets/test/inets_test_lib.erl1
3 files changed, 9 insertions, 4 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 81a1fdab4e..8cce152697 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -156,6 +156,9 @@ groups() ->
%% variable, but should NOT alter/remove any existing entries.
%%--------------------------------------------------------------------
init_per_suite(Config) ->
+
+ ?PRINT_SYSTEM_INFO([]),
+
PrivDir = ?config(priv_dir, Config),
DataDir = ?config(data_dir, Config),
ServerRoot = filename:join(PrivDir, "server_root"),
@@ -179,8 +182,8 @@ init_per_suite(Config) ->
{ok, FileInfo} = file:read_file_info(Cgi),
ok = file:write_file_info(Cgi, FileInfo#file_info{mode = 8#00755}),
- [{server_root, ServerRoot},
- {has_ipv6_support, inets_test_lib:has_ipv6_support()},
+ [{has_ipv6_support, inets_test_lib:has_ipv6_support()},
+ {server_root, ServerRoot},
{doc_root, DocRoot},
{local_port, ?IP_PORT},
{local_ssl_port, ?SSL_PORT} | Config].
@@ -199,6 +202,7 @@ end_per_suite(Config) ->
application:stop(ssl),
ok.
+
%%--------------------------------------------------------------------
%% Function: init_per_testcase(Case, Config) -> Config
%% Case - atom()
@@ -246,8 +250,6 @@ init_per_testcase(Case, Timeout, Config) ->
"~n~n*** INIT ~w:~w[~w] ***"
"~n~n", [?MODULE, Case, Timeout]),
- ?PRINT_SYSTEM_INFO("init_per_testcase"),
-
PrivDir = ?config(priv_dir, Config),
application:stop(inets),
Dog = test_server:timetrap(inets_test_lib:minutes(Timeout)),
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index a4bb8f7159..2c4c0f84a8 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -314,6 +314,8 @@ init_per_suite(Config) ->
"~n Config: ~p"
"~n", [Config]),
+ ?PRINT_SYSTEM_INFO([]),
+
PrivDir = ?config(priv_dir, Config),
SuiteTopDir = filename:join(PrivDir, ?MODULE),
case file:make_dir(SuiteTopDir) of
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index 38ffcdc226..434fa17307 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -41,6 +41,7 @@
-export([flush/0]).
-export([start_node/1, stop_node/1]).
+
%% -- Misc os command and stuff
has_ipv6_support() ->