From d2f367fba3a44101ccc333d83ab0c889cca2317b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 19 Nov 2018 09:29:21 +0100 Subject: Use try..after in tests that start their own listeners --- test/misc_SUITE.erl | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'test/misc_SUITE.erl') diff --git a/test/misc_SUITE.erl b/test/misc_SUITE.erl index 4ad2325..45fb04e 100644 --- a/test/misc_SUITE.erl +++ b/test/misc_SUITE.erl @@ -82,25 +82,31 @@ set_env(Config0) -> Config = cowboy_test:init_http(?FUNCTION_NAME, #{ env => #{dispatch => []} }, Config0), - ConnPid1 = gun_open(Config), - Ref1 = gun:get(ConnPid1, "/"), - {response, _, 400, _} = gun:await(ConnPid1, Ref1), - cowboy:set_env(?FUNCTION_NAME, dispatch, init_dispatch(Config)), - %% Only new connections get the updated environment. - ConnPid2 = gun_open(Config), - Ref2 = gun:get(ConnPid2, "/"), - {response, _, 200, _} = gun:await(ConnPid2, Ref2), - ok. + try + ConnPid1 = gun_open(Config), + Ref1 = gun:get(ConnPid1, "/"), + {response, _, 400, _} = gun:await(ConnPid1, Ref1), + cowboy:set_env(?FUNCTION_NAME, dispatch, init_dispatch(Config)), + %% Only new connections get the updated environment. + ConnPid2 = gun_open(Config), + Ref2 = gun:get(ConnPid2, "/"), + {response, _, 200, _} = gun:await(ConnPid2, Ref2) + after + cowboy:stop_listener(?FUNCTION_NAME) + end. set_env_missing(Config0) -> doc("Live replace a middleware environment value when env was not provided."), Config = cowboy_test:init_http(?FUNCTION_NAME, #{}, Config0), - ConnPid1 = gun_open(Config), - Ref1 = gun:get(ConnPid1, "/"), - {response, _, 500, _} = gun:await(ConnPid1, Ref1), - cowboy:set_env(?FUNCTION_NAME, dispatch, []), - %% Only new connections get the updated environment. - ConnPid2 = gun_open(Config), - Ref2 = gun:get(ConnPid2, "/"), - {response, _, 400, _} = gun:await(ConnPid2, Ref2), - ok. + try + ConnPid1 = gun_open(Config), + Ref1 = gun:get(ConnPid1, "/"), + {response, _, 500, _} = gun:await(ConnPid1, Ref1), + cowboy:set_env(?FUNCTION_NAME, dispatch, []), + %% Only new connections get the updated environment. + ConnPid2 = gun_open(Config), + Ref2 = gun:get(ConnPid2, "/"), + {response, _, 400, _} = gun:await(ConnPid2, Ref2) + after + cowboy:stop_listener(?FUNCTION_NAME) + end. -- cgit v1.2.3