From 14ba395c21d94d84e9251590cc440b3acbea381d Mon Sep 17 00:00:00 2001
From: Gilbert Wong <gilbertwong96@icloud.com>
Date: Fri, 31 Aug 2018 19:15:17 +0800
Subject: [PATCH] fix seesion and connectiong test suites

---
 test/emqx_connection_SUITE.erl | 23 ++++++++++++++++++++---
 test/emqx_listeners_SUITE.erl  |  9 ++++-----
 test/emqx_session_SUITE.erl    |  8 +++++++-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/test/emqx_connection_SUITE.erl b/test/emqx_connection_SUITE.erl
index ae69cdd5d..716e771b5 100644
--- a/test/emqx_connection_SUITE.erl
+++ b/test/emqx_connection_SUITE.erl
@@ -19,12 +19,29 @@
 
 -include_lib("common_test/include/ct.hrl").
 
-all() -> [t_attrs].
+all() -> 
+    [{group, connection}].
+
+groups() ->
+    [{connection, [sequence], [t_attrs]}].
+
+init_per_suite(Config) ->
+    emqx_ct_broker_helpers:run_setup_steps(),
+    Config.
+    
+end_per_suite(_Config) ->
+    emqx_ct_broker_helpers:run_teardown_steps().
+
 
 t_attrs(_) ->
-    emqx_ct_broker_helpers:run_setup_steps(),
     {ok, C, _} = emqx_client:start_link([{host, "localhost"}, {client_id, <<"simpleClient">>}, {username, <<"plain">>}, {password, <<"plain">>}]),
     [{<<"simpleClient">>, ConnPid}] = emqx_cm:lookup_connection(<<"simpleClient">>),
     Attrs = emqx_connection:attrs(ConnPid),
     <<"simpleClient">> = proplists:get_value(client_id, Attrs),
-    <<"plain">> = proplists:get_value(username, Attrs).
\ No newline at end of file
+    <<"plain">> = proplists:get_value(username, Attrs),
+    emqx_client:disconnect(C).
+
+%% t_stats() ->
+%%     {ok, C, _ } = emqx_client;
+%% t_stats() ->
+
diff --git a/test/emqx_listeners_SUITE.erl b/test/emqx_listeners_SUITE.erl
index d55bba400..6086e98c2 100644
--- a/test/emqx_listeners_SUITE.erl
+++ b/test/emqx_listeners_SUITE.erl
@@ -28,15 +28,14 @@ all() ->
     [start_stop_listeners,
      restart_listeners].
 
-init_per_suite() ->
+init_per_suite(Config) ->
     NewConfig = generate_config(),
     application:ensure_all_started(esockd),
     lists:foreach(fun set_app_env/1, NewConfig),
-    ok.
+    Config.
 
-end_per_suite() ->
-    application:stop(esockd),
-    ok.
+end_per_suite(_Config) ->
+    application:stop(esockd).
 
 start_stop_listeners(_) ->
     ok = emqx_listeners:start(),
diff --git a/test/emqx_session_SUITE.erl b/test/emqx_session_SUITE.erl
index f2da10b74..526f8b729 100644
--- a/test/emqx_session_SUITE.erl
+++ b/test/emqx_session_SUITE.erl
@@ -21,8 +21,14 @@
 
 all() -> [t_session_all].
 
-t_session_all(_) ->
+init_per_suite(Config) ->
     emqx_ct_broker_helpers:run_setup_steps(),
+    Config.
+    
+end_per_suite(_Config) ->
+    emqx_ct_broker_helpers:run_teardown_steps().
+
+t_session_all(_) ->
     ClientId = <<"ClientId">>,
     {ok, ConnPid} = emqx_mock_client:start_link(ClientId),
     {ok, SPid} = emqx_mock_client:open_session(ConnPid, ClientId, internal),