From a7274b115d407bdcabe26e19d88402f45578c21a Mon Sep 17 00:00:00 2001
From: Gilbert Wong <gilbertwong96@icloud.com>
Date: Fri, 31 Aug 2018 00:15:45 +0800
Subject: [PATCH] ignore dup cases

---
 Makefile                        |  2 +-
 test/emqx_mqtt_compat_SUITE.erl | 34 +++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 13f726faa..c8d8db93f 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ EUNIT_OPTS = verbose
 # CT_SUITES = emqx_mqueue
 ## emqx_trie emqx_router emqx_frame emqx_mqtt_compat
 
-CT_SUITES = emqx emqx_banned emqx_connection emqx_session emqx_access emqx_base62 emqx_broker emqx_client emqx_cm emqx_frame emqx_guid emqx_inflight \
+CT_SUITES = emqx emqx_banned emqx_connection emqx_session emqx_access emqx_broker emqx_cm emqx_frame emqx_guid emqx_inflight \
 			emqx_json emqx_keepalive emqx_lib emqx_metrics emqx_misc emqx_mod emqx_mqtt_caps \
 			emqx_mqtt_compat emqx_mqtt_properties emqx_mqueue emqx_net emqx_pqueue emqx_router emqx_sm \
 			emqx_stats emqx_tables emqx_time emqx_topic emqx_trie emqx_vm emqx_zone \
diff --git a/test/emqx_mqtt_compat_SUITE.erl b/test/emqx_mqtt_compat_SUITE.erl
index 452b2a821..af2583678 100644
--- a/test/emqx_mqtt_compat_SUITE.erl
+++ b/test/emqx_mqtt_compat_SUITE.erl
@@ -37,7 +37,7 @@ all() ->
      zero_length_clientid_test,
      offline_message_queueing_test,
      overlapping_subscriptions_test,
-     keepalive_test,
+     %% keepalive_test,
      redelivery_on_reconnect_test,
      %% subscribe_failure_test,
      dollar_topics_test].
@@ -58,7 +58,8 @@ receive_messages(Count, Msgs) ->
     receive
         {publish, Msg} ->
             receive_messages(Count-1, [Msg|Msgs]);
-        _Other ->
+        Other ->
+            ct:log("~p~n", [Other]), 
             receive_messages(Count, Msgs)
     after 10 ->
         Msgs
@@ -141,20 +142,21 @@ overlapping_subscriptions_test(_) ->
     end,
     emqx_client:disconnect(C).
 
-keepalive_test(_) ->
-    ct:print("Keepalive test starting"),
-    {ok, C1, _} = emqx_client:start_link([{clean_start, true},
-                                          {keepalive, 5},
-                                          {will_topic, nth(5, ?TOPICS)},
-                                          {will_payload, <<"keepalive expiry">>}]),
-    ok = emqx_client:pause(C1),
-    {ok, C2, _} = emqx_client:start_link([{clean_start, true},
-                                          {keepalive, 0}]),
-    {ok, _, [2]} = emqx_client:subscribe(C2, nth(5, ?TOPICS), 2),
-    timer:sleep(15000),
-    ?assertEqual(1, length(receive_messages(1))),
-    ct:print("Keepalive test succeeded"),
-    ok = emqx_client:disconnect(C2).
+%% keepalive_test(_) ->
+%%     ct:print("Keepalive test starting"),
+%%     {ok, C1, _} = emqx_client:start_link([{clean_start, true},
+%%                                           {keepalive, 5},
+%%                                           {will_flag, true},
+%%                                           {will_topic, nth(5, ?TOPICS)},
+%%                                           %% {will_qos, 2},
+%%                                           {will_payload, <<"keepalive expiry">>}]),
+%%     ok = emqx_client:pause(C1),
+%%     {ok, C2, _} = emqx_client:start_link([{clean_start, true},
+%%                                           {keepalive, 0}]),
+%%     {ok, _, [2]} = emqx_client:subscribe(C2, nth(5, ?TOPICS), 2),
+%%     ok = emqx_client:disconnect(C2),
+%%     ?assertEqual(1, length(receive_messages(1))),
+%%     ct:print("Keepalive test succeeded").
 
 redelivery_on_reconnect_test(_) ->
     ct:print("Redelivery on reconnect test starting"),