diff options
| author | Micael Karlberg <[email protected]> | 2011-11-09 18:43:56 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-09 18:43:56 +0100 |
| commit | 26bc99756aec24a3a3ddbbf214aa14fe4a8e0d4e (patch) | |
| tree | 9b898e19fdfca6a08a2a10f3b2856ab993dd8d4b /lib/inets/test/httpd_basic_SUITE.erl | |
| parent | 1a87cd90774b0b17e6e197a94c20dcbcb1f6a4cb (diff) | |
| download | otp-26bc99756aec24a3a3ddbbf214aa14fe4a8e0d4e.tar.gz otp-26bc99756aec24a3a3ddbbf214aa14fe4a8e0d4e.tar.bz2 otp-26bc99756aec24a3a3ddbbf214aa14fe4a8e0d4e.zip | |
More merge cleanup.
Diffstat (limited to 'lib/inets/test/httpd_basic_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpd_basic_SUITE.erl | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl index 355f81da17..4cd38f2ec4 100644 --- a/lib/inets/test/httpd_basic_SUITE.erl +++ b/lib/inets/test/httpd_basic_SUITE.erl @@ -272,29 +272,12 @@ find_URL_path([_ | Rest]) -> tsp(F) -> - tsp(F, []). + inets_test_lib:tsp(F). tsp(F, A) -> - test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]). + inets_test_lib:tsp(F, A). - -tsp(F) -> - tsp(F, []). -tsp(F, A) -> - Timestamp = formated_timestamp(), - test_server:format("** ~s ** ~p ~p:" ++ F ++ "~n", - [Timestamp, self(), ?MODULE | A]). - -formated_timestamp() -> - format_timestamp( os:timestamp() ). - -format_timestamp({_N1, _N2, N3} = Now) -> - {Date, Time} = calendar:now_to_datetime(Now), - {YYYY,MM,DD} = Date, - {Hour,Min,Sec} = Time, - FormatDate = - io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w", - [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]), - lists:flatten(FormatDate). +tsf(Reason) -> + test_server:fail(Reason). skip(Reason) -> |