diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index fd7855004..9dedf3644 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -59,12 +59,12 @@ {statistics, true} ]}. -{project_plugins, [ - {erlfmt, [ - {files, [ - "{src,include,test}/*.{hrl,erl,app.src}", - "rebar.config", - "rebar.config.script" - ]} +{project_plugins, [erlfmt]}. + +{erlfmt, [ + {files, [ + "{src,include,test}/*.{hrl,erl,app.src}", + "rebar.config", + "rebar.config.script" ]} ]}. diff --git a/apps/emqx_utils/test/emqx_utils_fs_SUITE.erl b/apps/emqx_utils/test/emqx_utils_fs_SUITE.erl index 9018a6189..32147c3b8 100644 --- a/apps/emqx_utils/test/emqx_utils_fs_SUITE.erl +++ b/apps/emqx_utils/test/emqx_utils_fs_SUITE.erl @@ -33,16 +33,13 @@ t_traverse_dir(Config) -> Traversal = lists:sort(emqx_utils_fs:traverse_dir(fun cons_fileinfo/3, [], Dir)), ?assertMatch( [ - {"nonempty/d1/1", #file_info{type = regular, mode = ORWAR}}, - {"nonempty/d1/2", #file_info{type = regular, mode = ORWAR}}, + {"nonempty/d1/1", #file_info{type = regular}}, + {"nonempty/d1/2", #file_info{type = regular}}, {"nonempty/d1/mutrec", #file_info{type = symlink, mode = ARWX}}, - {"nonempty/d1/файл", #file_info{type = regular}}, {"nonempty/d2/deep/down/here", #file_info{type = regular, mode = ORW}}, - {"nonempty/d2/deep/mutrec", #file_info{type = symlink, mode = ARWX}}, - {"nonempty/д3", #file_info{type = symlink, mode = ARWX}} + {"nonempty/d2/deep/mutrec", #file_info{type = symlink, mode = ARWX}} ] when - ((ORWAR band 8#00644 =:= 8#00644) and - (ORW band 8#00600 =:= 8#00600) and + ((ORW band 8#00600 =:= 8#00600) and (ARWX band 8#00777 =:= 8#00777)), [{string:prefix(Filename, Dir), Info} || {Filename, Info} <- Traversal] diff --git a/apps/emqx_utils/test/emqx_utils_fs_SUITE_data/nonempty/d1/mutrec b/apps/emqx_utils/test/emqx_utils_fs_SUITE_data/nonempty/d1/mutrec index ca385d3e7..d378eb1b6 120000 --- a/apps/emqx_utils/test/emqx_utils_fs_SUITE_data/nonempty/d1/mutrec +++ b/apps/emqx_utils/test/emqx_utils_fs_SUITE_data/nonempty/d1/mutrec @@ -1 +1 @@ -../../empty \ No newline at end of file +../d2/deep/down \ No newline at end of file diff --git a/apps/emqx_utils/test/emqx_utils_fs_SUITE_data/nonempty/d1/файл b/apps/emqx_utils/test/emqx_utils_fs_SUITE_data/nonempty/d1/файл deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/emqx_utils/test/emqx_utils_fs_SUITE_data/nonempty/д3 b/apps/emqx_utils/test/emqx_utils_fs_SUITE_data/nonempty/д3 deleted file mode 120000 index 8ade2da06..000000000 --- a/apps/emqx_utils/test/emqx_utils_fs_SUITE_data/nonempty/д3 +++ /dev/null @@ -1 +0,0 @@ -../dx \ No newline at end of file