diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:42:36 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:42:36 +0100 |
| commit | 0e57778762b63601fa9861558d0e353360fe647a (patch) | |
| tree | 16f50886d8fb1a732cb42ffcacdef25da372a471 /lib/inets/test/inets_test_lib.erl | |
| parent | 704f2b867949aa5697b3abff672631f96cdfa9b2 (diff) | |
| parent | 744984833cc1a51f51781e3417db7f152eeab4ae (diff) | |
| download | otp-0e57778762b63601fa9861558d0e353360fe647a.tar.gz otp-0e57778762b63601fa9861558d0e353360fe647a.tar.bz2 otp-0e57778762b63601fa9861558d0e353360fe647a.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/inets/test/inets_test_lib.erl')
| -rw-r--r-- | lib/inets/test/inets_test_lib.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl index 6ccc7b0da1..4be9d9c8b3 100644 --- a/lib/inets/test/inets_test_lib.erl +++ b/lib/inets/test/inets_test_lib.erl @@ -287,7 +287,9 @@ print(F, A, Mod, Line) -> print("", F, A, Mod, Line). hostname() -> - from($@, atom_to_list(node())). + {ok, Name} = inet:gethostname(), + Name. + from(H, [H | T]) -> T; from(H, [_ | T]) -> from(H, T); from(_, []) -> []. @@ -545,14 +547,14 @@ tsp(F) -> tsp(F, []). tsp(F, A) -> Timestamp = formated_timestamp(), - test_server:format("*** ~s ~p ~p " ++ F ++ "~n", + ct:pal("*** ~s ~p ~p " ++ F ++ "~n", [Timestamp, node(), self() | A]). tsf(Reason) -> - test_server:fail(Reason). + ct:fail(Reason). tss(Time) -> - test_server:sleep(Time). + ct:sleep(Time). timestamp() -> http_util:timestamp(). |