diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-24 13:52:07 +0100 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-03-24 13:52:07 +0100 |
| commit | e10385909c687590d6522d007bba9d72f3f5c380 (patch) | |
| tree | 51227978bac92c6eb5f94c4bc20c2b9b7d1c396e /lib/inets/test/ftp_suite_lib.erl | |
| parent | 487446e76102b27fa8df02a353c7fdeec2d091f1 (diff) | |
| download | otp-e10385909c687590d6522d007bba9d72f3f5c380.tar.gz otp-e10385909c687590d6522d007bba9d72f3f5c380.tar.bz2 otp-e10385909c687590d6522d007bba9d72f3f5c380.zip | |
inets: Add new module inets_time_compat with new time API
The new module is backwards compatible.
Diffstat (limited to 'lib/inets/test/ftp_suite_lib.erl')
| -rw-r--r-- | lib/inets/test/ftp_suite_lib.erl | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl index 5ae9eb736e..b637832101 100644 --- a/lib/inets/test/ftp_suite_lib.erl +++ b/lib/inets/test/ftp_suite_lib.erl @@ -29,7 +29,6 @@ % -export([init_per_testcase/2, end_per_testcase/2]). -compile(export_all). --compile([{nowarn_deprecated_function,{erlang,now,0}}]). -record(progress, { @@ -1353,15 +1352,9 @@ do_delete(Pid, Config) -> ok. do_mkdir(Pid) -> - %% Adapt to OTP 18 erlang time API and be backwards compatible - NewDir = try - "earl_" ++ integer_to_list(erlang:unique_integer([positive])) - catch - error:undef -> - {A, B, C} = erlang:now(), - "nisse_" ++ integer_to_list(A) ++ "_" ++ - integer_to_list(B) ++ "_" ++ integer_to_list(C) - end, + NewDir = "earl_" ++ + integer_to_list(inets_time_compat:unique_integer([positive])), + ok = ftp:cd(Pid, "incoming"), {ok, CurrDir} = ftp:pwd(Pid), {error, efnamena} = ftp:mkdir(Pid, NewDir++"\r\nCWD ."), |