Skip to content

Commit

Permalink
Close connections using rabbit_ct_client_helpers
Browse files Browse the repository at this point in the history 
Per discussion with @dumbbell.
  • Loading branch information
@michaelklishin
michaelklishin committed Jul 5, 2016
1 parent 26fecc9 commit 4028c66
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions test/per_vhost_connection_limit_SUITE.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ most_basic_single_node_test(Config) ->
?assertEqual(0, count_connections_in(Config, VHost)),
Conn = open_unmanaged_connection(Config, 0),
?assertEqual(1, count_connections_in(Config, VHost)),
amqp_connection:close(Conn),
rabbit_ct_client_helpers:close_connection(Conn),
?assertEqual(0, count_connections_in(Config, VHost)),

passed.
Expand All @@ -123,7 +123,7 @@ single_node_single_vhost_test(Config) ->

Conn1 = open_unmanaged_connection(Config, 0),
?assertEqual(1, count_connections_in(Config, VHost)),
amqp_connection:close(Conn1),
rabbit_ct_client_helpers:close_connection(Conn1),
?assertEqual(0, count_connections_in(Config, VHost)),

Conn2 = open_unmanaged_connection(Config, 0),
Expand All @@ -142,7 +142,7 @@ single_node_single_vhost_test(Config) ->
?assertEqual(3, count_connections_in(Config, VHost)),

lists:foreach(fun (C) ->
amqp_connection:close(C)
rabbit_ct_client_helpers:close_connection(C)
end, [Conn2, Conn3, Conn5]),

?assertEqual(0, count_connections_in(Config, VHost)),
Expand All @@ -164,7 +164,7 @@ single_node_multiple_vhost_test(Config) ->

Conn1 = open_unmanaged_connection(Config, 0, VHost1),
?assertEqual(1, count_connections_in(Config, VHost1)),
amqp_connection:close(Conn1),
rabbit_ct_client_helpers:close_connection(Conn1),
?assertEqual(0, count_connections_in(Config, VHost1)),

Conn2 = open_unmanaged_connection(Config, 0, VHost2),
Expand All @@ -187,7 +187,7 @@ single_node_multiple_vhost_test(Config) ->
?assertEqual(3, count_connections_in(Config, VHost2)),

lists:foreach(fun (C) ->
amqp_connection:close(C)
rabbit_ct_client_helpers:close_connection(C)
end, [Conn2, Conn3, Conn5, Conn6]),

?assertEqual(0, count_connections_in(Config, VHost1)),
Expand All @@ -213,7 +213,7 @@ single_node_list_in_vhost_test(Config) ->

Conn1 = open_unmanaged_connection(Config, 0, VHost1),
[#tracked_connection{vhost = VHost1}] = connections_in(Config, VHost1),
amqp_connection:close(Conn1),
rabbit_ct_client_helpers:close_connection(Conn1),
?assertEqual(0, length(connections_in(Config, VHost1))),

Conn2 = open_unmanaged_connection(Config, 0, VHost2),
Expand All @@ -233,7 +233,7 @@ single_node_list_in_vhost_test(Config) ->
all_connections(Config))),

lists:foreach(fun (C) ->
amqp_connection:close(C)
rabbit_ct_client_helpers:close_connection(C)
end, [Conn2, Conn3, Conn5, Conn6]),

?assertEqual(0, length(all_connections(Config))),
Expand All @@ -256,7 +256,7 @@ most_basic_cluster_test(Config) ->
?assertEqual(3, count_connections_in(Config, VHost)),

lists:foreach(fun (C) ->
amqp_connection:close(C)
rabbit_ct_client_helpers:close_connection(C)
end, [Conn1, Conn2, Conn3]),

?assertEqual(0, count_connections_in(Config, VHost)),
Expand All @@ -269,7 +269,7 @@ cluster_single_vhost_test(Config) ->

Conn1 = open_unmanaged_connection(Config, 0),
?assertEqual(1, count_connections_in(Config, VHost)),
amqp_connection:close(Conn1),
rabbit_ct_client_helpers:close_connection(Conn1),
?assertEqual(0, count_connections_in(Config, VHost)),

Conn2 = open_unmanaged_connection(Config, 1),
Expand All @@ -288,7 +288,7 @@ cluster_single_vhost_test(Config) ->
?assertEqual(3, count_connections_in(Config, VHost)),

lists:foreach(fun (C) ->
amqp_connection:close(C)
rabbit_ct_client_helpers:close_connection(C)
end, [Conn2, Conn3, Conn5]),

?assertEqual(0, count_connections_in(Config, VHost)),
Expand All @@ -310,7 +310,7 @@ cluster_multiple_vhost_test(Config) ->

Conn1 = open_unmanaged_connection(Config, 0, VHost1),
?assertEqual(1, count_connections_in(Config, VHost1)),
amqp_connection:close(Conn1),
rabbit_ct_client_helpers:close_connection(Conn1),
?assertEqual(0, count_connections_in(Config, VHost1)),

Conn2 = open_unmanaged_connection(Config, 1, VHost2),
Expand All @@ -333,7 +333,7 @@ cluster_multiple_vhost_test(Config) ->
?assertEqual(3, count_connections_in(Config, VHost2)),

lists:foreach(fun (C) ->
amqp_connection:close(C)
rabbit_ct_client_helpers:close_connection(C)
end, [Conn2, Conn3, Conn5, Conn6]),

?assertEqual(0, count_connections_in(Config, VHost1)),
Expand All @@ -350,7 +350,7 @@ cluster_node_restart_test(Config) ->

Conn1 = open_unmanaged_connection(Config, 0),
?assertEqual(1, count_connections_in(Config, VHost)),
amqp_connection:close(Conn1),
rabbit_ct_client_helpers:close_connection(Conn1),
?assertEqual(0, count_connections_in(Config, VHost)),

Conn2 = open_unmanaged_connection(Config, 1),
Expand All @@ -369,7 +369,7 @@ cluster_node_restart_test(Config) ->
?assertEqual(1, count_connections_in(Config, VHost)),

lists:foreach(fun (C) ->
(catch amqp_connection:close(C))
(catch rabbit_ct_client_helpers:close_connection(C))
end, [Conn2, Conn3, Conn4, Conn5]),

?assertEqual(0, count_connections_in(Config, VHost)),
Expand All @@ -384,7 +384,7 @@ cluster_node_list_on_node_test(Config) ->

Conn1 = open_unmanaged_connection(Config, 0),
[#tracked_connection{node = A}] = connections_on_node(Config, 0),
amqp_connection:close(Conn1),
rabbit_ct_client_helpers:close_connection(Conn1),
?assertEqual(0, length(connections_on_node(Config, 0))),

_Conn2 = open_unmanaged_connection(Config, 1),
Expand All @@ -407,7 +407,7 @@ cluster_node_list_on_node_test(Config) ->
?assertEqual(0, length(connections_on_node(Config, 0, B))),

lists:foreach(fun (C) ->
amqp_connection:close(C)
rabbit_ct_client_helpers:close_connection(C)
end, [Conn3, Conn5]),

timer:sleep(100),
Expand Down

0 comments on commit 4028c66

Please sign in to comment.