Make sure to stop the correct applications
We need to make sure and stop all applications that we started.
diff --git a/test/config_tests.erl b/test/config_tests.erl
index 196e29f..7e39b9a 100644
--- a/test/config_tests.erl
+++ b/test/config_tests.erl
@@ -75,26 +75,28 @@
setup_config_listener() ->
- setup(),
- spawn_config_listener().
+ Apps = setup(),
+ Pid = spawn_config_listener(),
+ {Apps, Pid}.
setup_config_notifier(Subscription) ->
- setup(),
- spawn_config_notifier(Subscription).
+ Apps = setup(),
+ Pid = spawn_config_notifier(Subscription),
+ {Apps, Pid}.
-teardown(Pid) when is_pid(Pid) ->
+teardown({Apps, Pid}) when is_pid(Pid) ->
catch exit(Pid, kill),
- teardown(undefined);
+ teardown(Apps);
-teardown(_) ->
- [application:stop(App) || App <- ?DEPS].
+teardown(Apps) when is_list(Apps) ->
+ test_util:stop_applications(Apps).
-teardown(_, Pid) when is_pid(Pid) ->
+teardown(_, {Apps, Pid}) when is_pid(Pid) ->
catch exit(Pid, kill),
- teardown(undefined);
-teardown(_, _) ->
- teardown(undefined).
+ teardown(Apps);
+teardown(_, Apps) ->
+ teardown(Apps).
handle_config_change("remove_handler", _Key, _Value, _Persist, {_Pid, _State}) ->
@@ -445,14 +447,14 @@
end).
-should_handle_value_change(Pid) ->
+should_handle_value_change({_Apps, Pid}) ->
?_test(begin
?assertEqual(ok, config:set("httpd", "port", "80", false)),
?assertMatch({{"httpd", "port", "80", false}, _}, getmsg(Pid))
end).
-should_pass_correct_state_to_handle_config_change(Pid) ->
+should_pass_correct_state_to_handle_config_change({_Apps, Pid}) ->
?_test(begin
?assertEqual(ok, config:set("update_state", "foo", "any", false)),
?assertMatch({_, undefined}, getmsg(Pid)),
@@ -461,7 +463,7 @@
end).
-should_pass_correct_state_to_handle_config_terminate(Pid) ->
+should_pass_correct_state_to_handle_config_terminate({_Apps, Pid}) ->
?_test(begin
?assertEqual(ok, config:set("update_state", "foo", "any", false)),
?assertMatch({_, undefined}, getmsg(Pid)),
@@ -472,14 +474,14 @@
end).
-should_pass_subscriber_pid_to_handle_config_terminate(Pid) ->
+should_pass_subscriber_pid_to_handle_config_terminate({_Apps, Pid}) ->
?_test(begin
?assertEqual(ok, config:set("remove_handler", "any", "any", false)),
?assertEqual({Pid, remove_handler, undefined}, getmsg(Pid))
end).
-should_not_call_handle_config_after_related_process_death(Pid) ->
+should_not_call_handle_config_after_related_process_death({_Apps, Pid}) ->
?_test(begin
?assertEqual(ok, config:set("remove_handler", "any", "any", false)),
?assertEqual({Pid, remove_handler, undefined}, getmsg(Pid)),
@@ -492,7 +494,7 @@
end).
-should_remove_handler_when_requested(Pid) ->
+should_remove_handler_when_requested({_Apps, Pid}) ->
?_test(begin
?assertEqual(1, n_handlers()),
?assertEqual(ok, config:set("remove_handler", "any", "any", false)),
@@ -501,7 +503,7 @@
end).
-should_remove_handler_when_pid_exits(Pid) ->
+should_remove_handler_when_pid_exits({_Apps, Pid}) ->
?_test(begin
?assertEqual(1, n_handlers()),
@@ -530,7 +532,7 @@
end).
-should_stop_monitor_on_error(Pid) ->
+should_stop_monitor_on_error({_Apps, Pid}) ->
?_test(begin
?assertEqual(1, n_handlers()),
@@ -556,27 +558,27 @@
?assertEqual(0, n_handlers())
end).
-should_notify(Subscription, Pid) ->
+should_notify(Subscription, {_Apps, Pid}) ->
{to_string(Subscription), ?_test(begin
?assertEqual(ok, config:set("section_foo", "key_bar", "any", false)),
?assertEqual({config_change,"section_foo", "key_bar", "any", false}, getmsg(Pid)),
ok
end)}.
-should_not_notify([{Section, _}] = Subscription, Pid) ->
+should_not_notify([{Section, _}] = Subscription, {_Apps, Pid}) ->
{to_string(Subscription), ?_test(begin
?assertEqual(ok, config:set(Section, "any", "any", false)),
?assertError({timeout, config_msg}, getmsg(Pid)),
ok
end)};
-should_not_notify(Subscription, Pid) ->
+should_not_notify(Subscription, {_Apps, Pid}) ->
{to_string(Subscription), ?_test(begin
?assertEqual(ok, config:set("any", "any", "any", false)),
?assertError({timeout, config_msg}, getmsg(Pid)),
ok
end)}.
-should_unsubscribe_when_subscriber_gone(_Subscription, Pid) ->
+should_unsubscribe_when_subscriber_gone(_Subscription, {_Apps, Pid}) ->
?_test(begin
?assertEqual(1, n_notifiers()),
