diff options
| author | Micael Karlberg <[email protected]> | 2012-07-11 11:15:23 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-07-11 11:15:23 +0200 |
| commit | 03dd7037e055e0879d4e8565518d61bd5f1870f7 (patch) | |
| tree | 06073d04b74c9c135783630dda581d21d6b165f7 /lib/inets/test/inets_test_lib.erl | |
| parent | 1b726abb2b874e00870c5bca2ef3e9d52828cd17 (diff) | |
| parent | ef14221acafe78b7a77b5d42b6a615fa7333750d (diff) | |
| download | otp-03dd7037e055e0879d4e8565518d61bd5f1870f7.tar.gz otp-03dd7037e055e0879d4e8565518d61bd5f1870f7.tar.bz2 otp-03dd7037e055e0879d4e8565518d61bd5f1870f7.zip | |
Merge branch 'bmk/inets/httpc/cancel_request/OTP-10092' into bmk/inets/inets591_integration
Diffstat (limited to 'lib/inets/test/inets_test_lib.erl')
| -rw-r--r-- | lib/inets/test/inets_test_lib.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl index c94be796cd..7f4b0ec8d8 100644 --- a/lib/inets/test/inets_test_lib.erl +++ b/lib/inets/test/inets_test_lib.erl @@ -31,6 +31,7 @@ send/3, close/2]). -export([copy_file/3, copy_files/2, copy_dirs/2, del_dirs/1]). -export([info/4, log/4, debug/4, print/4]). +-export([timestamp/0, formated_timestamp/0]). -export([tsp/1, tsp/2, tsf/1, tss/1]). -export([check_body/1]). -export([millis/0, millis_diff/2, hours/1, minutes/1, seconds/1, sleep/1]). @@ -642,6 +643,9 @@ tsf(Reason) -> tss(Time) -> test_server:sleep(Time). +timestamp() -> + http_util:timestamp(). + formated_timestamp() -> format_timestamp( os:timestamp() ). |