Merge pull request #2170 from josevalim/jv-set-env-error

Error on duplicated config apps/keys in -config

1 files changed, 5 insertions, 12 deletions

diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 94d7c17712..1ab554db7c 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -2020,18 +2020,11 @@ set_env_errors(Conf) when is_list(Conf) ->
     "application: kernel; erroneous parameter: distributed" =
 	badarg_msg(fun() -> application:set_env([{kernel, [{distributed, config}]}]) end),
 
-    %% This will raise in the future
-    ct:capture_start(),
-    _ = application:set_env([{foo, []}, {foo, []}]),
-    timer:sleep(100),
-    ct:capture_stop(),
-    [_ | _] = string:find(ct:capture_get(), "duplicate application config: foo"),
-
-    ct:capture_start(),
-    _ = application:set_env([{foo, [{bar, baz}, {bar, bat}]}]),
-    timer:sleep(100),
-    ct:capture_stop(),
-    [_ | _] = string:find(ct:capture_get(), "application: foo; duplicate parameter: bar"),
+    "duplicate application config: foo" =
+	badarg_msg(fun() -> application:set_env([{foo, []}, {foo, []}]) end),
+
+    "application: foo; duplicate parameter: bar" =
+	badarg_msg(fun() -> application:set_env([{foo, [{bar, baz}, {bar, bat}]}]) end),
 
     ok.