Update code after rebase

esl · Oct 23, 2023 · 9a32d45 · 9a32d45
1 parent b731721
commit 9a32d45
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 37 deletions.
diff --git a/test/amoc_users_monitor_SUITE.erl b/test/amoc_users_monitor_SUITE.erl
@@ -3,10 +3,6 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
--include("scenario_template_2.hrl").
-
--define(SCENARIO, my_test_scenario).
-
 -compile(export_all).
 
 all() ->
@@ -31,15 +27,13 @@ init_per_testcase(amoc_users_monitor_keeps_track_of_users, Config) ->
     common_init_per_testcase(Config).
 
 common_init_per_testcase(Config) ->
-    amoc_api_helper:start_amoc(),
-    ok = amoc_scenario:install_module(?SCENARIO, ?DUMMY_SCENARIO_MODULE(?SCENARIO)),
+    application:ensure_all_started(amoc),
     meck:new(amoc_dist, []),
     Config.
 
 end_per_testcase(_TC, _Config) ->
     meck:unload(amoc_dist),
-    amoc_api_helper:remove_module(?SCENARIO),
-    amoc_api_helper:stop_amoc().
+    application:stop(amoc).
 
 %% Test cases
 
@@ -49,7 +43,7 @@ error_when_amoc_users_monitor_is_disabled(_Config) ->
 
 amoc_users_monitor_keeps_track_of_users(_Config) ->
     ?assertEqual(enabled, amoc_users_monitor:is_users_monitor_enabled()),
-    ok = amoc:do(?SCENARIO, 10, []),
+    ok = amoc:do(dummy_scenario_test, 10, []),
 
     timer:sleep(1_000),
 
@@ -60,4 +54,4 @@ amoc_users_monitor_keeps_track_of_users(_Config) ->
     ?assertEqual(6, sets:size(MonitoredUsers)),
     ?assertEqual(2, length(DiedNormally)),
     ?assertEqual(2, length(DiedUnnormally)),
-    ?assertMatch([{_, {exit, test_crush_reason, _}} | _], DiedUnnormally).
+    ?assertMatch([{_, test_crush_reason} | _], DiedUnnormally).
diff --git a/test/scenario_template_2.hrl → test/dummy_scenario_test.erl b/test/scenario_template_2.hrl → test/dummy_scenario_test.erl
@@ -1,5 +1,5 @@
--define(DUMMY_SCENARIO_MODULE(Name), <<"
--module(",(atom_to_binary(Name,utf8))/binary,").
+-module(dummy_scenario_test).
+
 -behaviour(amoc_scenario).
 
 -export([start/1]).
@@ -9,7 +9,6 @@
 init() ->
     ok.
 
-% -spec start(amoc_scenario:user_id()) -> any().
 start(Id) when Id == 2 ->
     1 = 2;
 start(Id) when Id == 3 ->
@@ -19,5 +18,3 @@ start(Id) when Id == 5; Id == 6 ->
 start(_Id) ->
     timer:sleep(timer:minutes(1)),
     amoc_user:stop().
-
-">>).
diff --git a/test/scenario_template.hrl b/test/scenario_template.hrl