diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-09-04 19:44:53 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-09-04 19:51:43 +0200 |
| commit | da63b71f5069a5d9201e46087c8a1464b36442a3 (patch) | |
| tree | 2581529fe7d4b0b14ba029ff721cf5e88f132f1c | |
| parent | 43860a1a3c8d31f2104cc0d4fd4a67c4b0a82087 (diff) | |
| download | rabbitmq-server-git-da63b71f5069a5d9201e46087c8a1464b36442a3.tar.gz | |
unit_SUITE: Use `;` as the plugins path separator on Windows
| -rw-r--r-- | test/unit_SUITE.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/unit_SUITE.erl b/test/unit_SUITE.erl index 6582c24b1e..3ffe3f013e 100644 --- a/test/unit_SUITE.erl +++ b/test/unit_SUITE.erl @@ -882,8 +882,13 @@ listing_plugins_from_multiple_directories(Config) -> {FirstDir, plugin_both, "1"}, {SecondDir, plugin_both, "2"}]), - %% Everything was collected from both directories, plugin with higher version should take precedence - Path = FirstDir ++ ":" ++ SecondDir, + %% Everything was collected from both directories, plugin with higher + %% version should take precedence + PathSep = case os:type() of + {win32, _} -> ";"; + _ -> ":" + end, + Path = FirstDir ++ PathSep ++ SecondDir, Got = lists:sort([{Name, Vsn} || #plugin{name = Name, version = Vsn} <- rabbit_plugins:list(Path)]), Expected = [{plugin_both, "2"}, {plugin_first_dir, "3"}, {plugin_second_dir, "4"}], case Got of |