aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-07-26 09:56:47 +0200
committerJohn Högberg <[email protected]>2018-07-26 09:56:47 +0200
commitd9d694ca3ea8a168c51145fc485a3bcbc18f6188 (patch)
tree3ae824615ddadabdbeae2679b1aa4f717195b4b8 /lib/kernel
parentd7e303cb7981e2ceb0eb0074cf7402feec5da868 (diff)
parenta0b2cc0a377d780fe938ba9be3e417c7a8e00914 (diff)
downloadotp-d9d694ca3ea8a168c51145fc485a3bcbc18f6188.tar.gz
otp-d9d694ca3ea8a168c51145fc485a3bcbc18f6188.tar.bz2
otp-d9d694ca3ea8a168c51145fc485a3bcbc18f6188.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/file_SUITE.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 23913ac56a..e784c06865 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -1367,6 +1367,10 @@ file_info_basic_file(Config) when is_list(Config) ->
io:put_chars(Fd1, "foo bar"),
ok = ?FILE_MODULE:close(Fd1),
+ %% Don't crash the file server when passing incorrect arguments.
+ {error,badarg} = ?FILE_MODULE:read_file_info(Name, [{time, gurka}]),
+ {error,badarg} = ?FILE_MODULE:read_file_info([#{} | gaffel]),
+
%% Test that the file has the expected attributes.
%% The times are tricky, so we will save them to a separate test case.
{ok,FileInfo} = ?FILE_MODULE:read_file_info(Name),