diff options
| author | Rickard Green <[email protected]> | 2018-10-12 17:59:18 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-10-12 17:59:18 +0200 |
| commit | 8e65d31faab67b9844bbbaaa6245b2da2dd97b76 (patch) | |
| tree | fec253c9db3c1d24b77f3f4933b8361ef740266b /lib/kernel/test/prim_file_SUITE.erl | |
| parent | e620c8c507c33ebca6216d71a8de73bce2722ac2 (diff) | |
| parent | 13baa4384c4c9c49e6d540bc8ae6b8946f2454ed (diff) | |
| download | otp-8e65d31faab67b9844bbbaaa6245b2da2dd97b76.tar.gz otp-8e65d31faab67b9844bbbaaa6245b2da2dd97b76.tar.bz2 otp-8e65d31faab67b9844bbbaaa6245b2da2dd97b76.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
erts: Fix UNC path handling on Windows
erts: Fix a compiler warning
eldap: Fix race at socket close
Fix bug for sockopt pktoptions on BSD
erts: Fix memory leak on file read errors
Diffstat (limited to 'lib/kernel/test/prim_file_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/prim_file_SUITE.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl index a02b5f87d1..2f465a15bc 100644 --- a/lib/kernel/test/prim_file_SUITE.erl +++ b/lib/kernel/test/prim_file_SUITE.erl @@ -1300,7 +1300,8 @@ e_delete(Config) when is_list(Config) -> case os:type() of {win32, _} -> %% Remove a character device. - {error, eacces} = ?PRIM_FILE:delete("nul"); + expect({error, eacces}, {error, einval}, + ?PRIM_FILE:delete("nul")); _ -> ?PRIM_FILE:write_file_info( Base, #file_info {mode=0}), |