yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10768 from zhongwencool/swaggger-json-test 

fix: make sure swagger.json is fully generated
This commit is contained in:
zhongwencool 2023-05-22 17:27:00 +08:00 committed by GitHub
parent a1a5681d5b cb5a596c57
commit 59450e5ea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
View File

@ -55,6 +55,10 @@ all() ->
emqx_common_test_helpers:all(?MODULE). emqx_common_test_helpers:all(?MODULE).
init_per_suite(Config) -> init_per_suite(Config) ->
%% Load all applications to ensure swagger.json is fully generated.
Apps = emqx_machine_boot:reboot_apps(),
ct:pal("load apps:~p~n", [Apps]),
lists:foreach(fun(App) -> application:load(App) end, Apps),
emqx_mgmt_api_test_util:init_suite([emqx_management]), emqx_mgmt_api_test_util:init_suite([emqx_management]),
Config. Config.

4
apps/emqx_machine/src/emqx_machine_boot.erl
View File

@ -26,7 +26,7 @@
-dialyzer({no_match, [basic_reboot_apps/0]}). -dialyzer({no_match, [basic_reboot_apps/0]}).
-ifdef(TEST). -ifdef(TEST).
-export([sorted_reboot_apps/1]). -export([sorted_reboot_apps/1, reboot_apps/0]).
-endif. -endif.
%% these apps are always (re)started by emqx_machine %% these apps are always (re)started by emqx_machine
@ -120,7 +120,7 @@ restart_type(App) ->
%% the list of (re)started apps depends on release type/edition %% the list of (re)started apps depends on release type/edition
reboot_apps() -> reboot_apps() ->
{ok, ConfigApps0} = application:get_env(emqx_machine, applications), ConfigApps0 = application:get_env(emqx_machine, applications, []),
BaseRebootApps = basic_reboot_apps(), BaseRebootApps = basic_reboot_apps(),
ConfigApps = lists:filter(fun(App) -> not lists:member(App, BaseRebootApps) end, ConfigApps0), ConfigApps = lists:filter(fun(App) -> not lists:member(App, BaseRebootApps) end, ConfigApps0),
BaseRebootApps ++ ConfigApps. BaseRebootApps ++ ConfigApps.