OTP-24: fix variable '_Handler' is already bound warning

travelping · Feb 25, 2021 · d71b404 · d71b404
1 parent 7544946
commit d71b404
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/test/ggsn_SUITE.erl b/test/ggsn_SUITE.erl
@@ -993,7 +993,7 @@ path_failure(Config) ->
     CtxKey = #context_key{socket = 'irx', id = {imsi, ?'IMSI', 5}},
     {GtpC, _, _} = create_pdp_context(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     #{left_tunnel := #tunnel{socket = CSocket}} = gtp_context:info(CtxPid),
 
     ClientIP = proplists:get_value(client_ip, Config),

diff --git a/test/ggsn_proxy_SUITE.erl b/test/ggsn_proxy_SUITE.erl
@@ -1016,7 +1016,7 @@ ggsn_broken_recovery(Config) ->
     CtxKey = #context_key{socket = 'irx', id = {imsi, ?'IMSI', 5}},
     {GtpC, _, _} = create_pdp_context(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     #{right_tunnel := #tunnel{socket = CSocket}} = gtp_context:info(CtxPid),
 
     FinalGSN = proplists:get_value(final_gsn, Config),
@@ -1055,7 +1055,7 @@ path_failure_to_ggsn(Config) ->
 
     {GtpC, _, _} = create_pdp_context(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     #{right_tunnel := #tunnel{socket = CSocket}} = gtp_context:info(CtxPid),
 
     FinalGSN = proplists:get_value(final_gsn, Config),
@@ -1112,7 +1112,7 @@ path_failure_to_ggsn_and_restore(Config) ->
 
     {GtpC, _, _} = create_pdp_context(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     #{right_tunnel := #tunnel{socket = CSocket}} = gtp_context:info(CtxPid),
 
     FinalGSN = proplists:get_value(final_gsn, Config),
@@ -1174,7 +1174,7 @@ path_failure_to_sgsn(Config) ->
     CtxKey = #context_key{socket = 'irx', id = {imsi, ?'IMSI', 5}},
     {GtpC, _, _} = create_pdp_context(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     #{left_tunnel := #tunnel{socket = CSocket}} = gtp_context:info(CtxPid),
 
     ClientIP = proplists:get_value(client_ip, Config),
@@ -1504,7 +1504,7 @@ error_indication_ggsn2sgsn(Config) ->
 
     {GtpC, _, _} = create_pdp_context(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     true = is_pid(CtxPid),
     #{bearer := #{right := RightBearer}} = gtp_context:info(CtxPid),
 
@@ -1570,7 +1570,7 @@ update_pdp_context_request_ra_update(Config) ->
     RemoteCtxKey = #context_key{socket = 'remote-irx', id = {imsi, ?'PROXY-IMSI', 5}},
 
     {GtpC1, _, _} = create_pdp_context(Config),
-    {_Handler, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
     #{left_tunnel := LeftTunnel1, bearer := #{left := LeftBearer1}} = gtp_context:info(CtxPid),
 
     {GtpC2, _, _} = update_pdp_context(ra_update, GtpC1),
@@ -1599,7 +1599,7 @@ update_pdp_context_request_tei_update(Config) ->
     RemoteCtxKey = #context_key{socket = 'remote-irx', id = {imsi, ?'PROXY-IMSI', 5}},
 
     {GtpC1, _, _} = create_pdp_context(Config),
-    {_Handler, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
     #{left_tunnel := LeftTunnel1, bearer := #{left := LeftBearer1}} = gtp_context:info(CtxPid),
 
     {_Handler, ProxyCtxPid} = gtp_context_reg:lookup(CtxKey),
@@ -1667,7 +1667,7 @@ update_pdp_context_request_broken_recovery(Config) ->
 			     meck:passthrough([ReqKey, Request, Response])
 		     end),
     {GtpC1, _, _} = create_pdp_context(Config),
-    {_Handler, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
     #{left_tunnel := LeftTunnel1, bearer := #{left := LeftBearer1}} = gtp_context:info(CtxPid),
 
     {GtpC2, _, _} = update_pdp_context(simple, GtpC1),

diff --git a/test/pgw_SUITE.erl b/test/pgw_SUITE.erl
@@ -1266,7 +1266,7 @@ path_failure(Config) ->
 
     {GtpC, _, _} = create_session(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     #{left_tunnel := #tunnel{socket = CSocket}} = gtp_context:info(CtxPid),
 
     ClientIP = proplists:get_value(client_ip, Config),

diff --git a/test/pgw_proxy_SUITE.erl b/test/pgw_proxy_SUITE.erl
@@ -1118,7 +1118,7 @@ path_failure_to_pgw(Config) ->
 
     {GtpC, _, _} = create_session(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     #{right_tunnel := #tunnel{socket = CSocket}} = gtp_context:info(CtxPid),
 
     FinalGSN = proplists:get_value(final_gsn, Config),
@@ -1173,7 +1173,7 @@ path_failure_to_pgw_and_restore(Config) ->
 
     {GtpC, _, _} = create_session(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     #{right_tunnel := #tunnel{socket = CSocket}} = gtp_context:info(CtxPid),
 
     FinalGSN = proplists:get_value(final_gsn, Config),
@@ -1237,7 +1237,7 @@ path_failure_to_sgw(Config) ->
 
     {GtpC, _, _} = create_session(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     #{left_tunnel := #tunnel{socket = CSocket}} = gtp_context:info(CtxPid),
 
     ClientIP = proplists:get_value(client_ip, Config),
@@ -1827,7 +1827,7 @@ error_indication_pgw2sgw(Config) ->
 
     {GtpC, _, _} = create_session(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(CtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(CtxKey),
     true = is_pid(CtxPid),
     #{bearer := #{right := RightBearer}} = gtp_context:info(CtxPid),
 
@@ -1894,7 +1894,7 @@ modify_bearer_request_ra_update(Config) ->
 
     {GtpC1, _, _} = create_session(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
     #{left_tunnel := LeftTunnel1, bearer := #{left := LeftBearer1}} = gtp_context:info(CtxPid),
 
     {GtpC2, _, _} = modify_bearer(ra_update, GtpC1),
@@ -1924,7 +1924,7 @@ modify_bearer_request_tei_update(Config) ->
 
     {GtpC1, _, _} = create_session(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
     #{left_tunnel := LeftTunnel1, bearer := #{left := LeftBearer1}} = gtp_context:info(CtxPid),
 
     {_Handler, ProxyCtxPid} = gtp_context_reg:lookup(CtxKey),
@@ -2416,7 +2416,7 @@ interop_sgsn_to_sgw(Config) ->
 
     {GtpC1, _, _} = ergw_ggsn_test_lib:create_pdp_context(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
     #{left_tunnel := LeftTunnel1, bearer := #{left := LeftBearer1}} = gtp_context:info(CtxPid),
 
     check_contexts_metric(v1, 3, 1),
@@ -2468,7 +2468,7 @@ interop_sgw_to_sgsn(Config) ->
 
     {GtpC1, _, _} = create_session(Config),
 
-    {_Handler, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
+    {_, CtxPid} = gtp_context_reg:lookup(RemoteCtxKey),
     #{left_tunnel := LeftTunnel1, bearer := #{left := LeftBearer1}} = gtp_context:info(CtxPid),
 
     check_contexts_metric(v1, 0, 0),