Ack when setting up subscription in tests.

wooga · Apr 16, 2012 · 12d700f · 12d700f
1 parent 9feabce
commit 12d700f
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/test/eredis_sub_tests.erl b/test/eredis_sub_tests.erl
@@ -23,8 +23,10 @@ add_channels(Sub, Channels) ->
     ok = eredis_sub:subscribe(Sub, Channels),
     lists:foreach(
       fun (C) ->
-              receive M -> ?assertEqual({subscribed, C, Sub}, M)
+              receive M ->
-              after 1 -> ok end
+                      ?assertEqual({subscribed, C, Sub}, M),
+                      eredis_sub:ack_message(Sub)
+              end
       end, Channels).
 
 
@@ -236,8 +238,10 @@ add_channels_pattern(Sub, Channels) ->
     ok = eredis_sub:psubscribe(Sub, Channels),
     lists:foreach(
       fun (C) ->
-              receive M -> ?assertEqual({subscribed, C, Sub}, M)
+              receive M ->
-              after 50 -> ok end
+                      ?assertEqual({subscribed, C, Sub}, M),
+                      eredis_sub:ack_message(Sub)
+              end
       end, Channels).
 
 
@@ -258,13 +262,6 @@ pubsub_pattern_test() ->
             throw(timeout)
     end,
 
-    receive
-        Msg ->
-            throw({unexpected_message, Msg})
-    after 5 ->
-            ok
-    end,
-
     eredis_sub:punsubscribe(Sub, [<<"chan1*">> , <<"chan2*">>]),
     eredis_sub:ack_message(Sub),
     eredis_sub:ack_message(Sub),
@@ -273,6 +270,13 @@ pubsub_pattern_test() ->
     receive {unsubscribed,_,_} =  M3 -> ?assertEqual({unsubscribed, <<"chan2*">>, Sub}, M3) end,
     eredis_sub:ack_message(Sub),
 
+    ?assertEqual({ok, <<"0">>}, eredis:q(Pub, ["PUBLISH", <<"chan123">>, <<"msg">>])),
+    receive
+        Msg -> throw({unexpected_message, Msg})
+    after 10 ->
+            ok
+    end,
+
     eredis_sub:stop(Sub).