diff options
| author | Micael Karlberg <[email protected]> | 2019-07-01 18:28:19 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-07-01 18:28:19 +0200 |
| commit | 2203794ff61884704b86f86ac7284c9c306e018d (patch) | |
| tree | 365a51faa88b3a98294d664d0ab23ccfa0e89ac3 /lib/megaco/test/megaco_timer_test.erl | |
| parent | 018f6ba0b4540187d271aaa2a7b48b2dc02831e2 (diff) | |
| parent | 6afac8386a0feefab34126997a064a631af8b40a (diff) | |
| download | otp-2203794ff61884704b86f86ac7284c9c306e018d.tar.gz otp-2203794ff61884704b86f86ac7284c9c306e018d.tar.bz2 otp-2203794ff61884704b86f86ac7284c9c306e018d.zip | |
Merge branch 'bmk/megaco/20190625/timer_test' into maint
Diffstat (limited to 'lib/megaco/test/megaco_timer_test.erl')
| -rw-r--r-- | lib/megaco/test/megaco_timer_test.erl | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/megaco/test/megaco_timer_test.erl b/lib/megaco/test/megaco_timer_test.erl index b60e8581cd..d3e8e27636 100644 --- a/lib/megaco/test/megaco_timer_test.erl +++ b/lib/megaco/test/megaco_timer_test.erl @@ -332,7 +332,7 @@ integer_timer_start_and_expire(Config) when is_list(Config) -> receive {timeout, Timeout} -> ok - after Timeout + 100 -> + after Timeout + 500 -> tmr_stop(Ref), error(no_timeout) end, @@ -443,13 +443,6 @@ print1(_, _, _, _) -> print(Prefix, F, A) -> io:format("*** [~s] ~s ~p ~s:~w ***" "~n " ++ F ++ "~n", - [formated_timestamp(), Prefix, self(), get(sname), get(tc) | A]). + [?FTS(), Prefix, self(), get(sname), get(tc) | A]). - - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -formated_timestamp() -> - megaco:format_timestamp(os:timestamp()). |