From 821ba079e0fbb1fb7815a2d049fc691926bf4306 Mon Sep 17 00:00:00 2001
From: Nicholas Kariniemi <nicholas.kariniemi@gmail.com>
Date: Mon, 6 Oct 2014 17:58:46 +0300
Subject: [PATCH] Add timeout to make tests work even if channel pull blocks

---
 src/test/grub/test/unit/state.clj | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/test/grub/test/unit/state.clj b/src/test/grub/test/unit/state.clj
index 302ec8f..e241c1b 100644
--- a/src/test/grub/test/unit/state.clj
+++ b/src/test/grub/test/unit/state.clj
@@ -14,7 +14,11 @@
 (defn states-atom [& states]
   (atom (apply hashed-states states)))
 
-(fact "Applies diff and returns empty diff when no server changes"
+(defn <!!? [c]
+  (let [[v p] (a/alts!! [c (a/timeout 100)])]
+    v))
+
+(fact "Applies diff an returns empty diff when no server changes"
   (let [states (states-atom
                 {:grubs {"1" {:text "2 apples" :completed false}} :recipes {}})
         msg {:type :diff
@@ -24,7 +28,7 @@
         out (chan 1)]
     (state/make-server-agent in out states)
     (>!! in msg)
-    (let [response (<!! out)]
+    (let [response (<!!? out)]
       @states => (hashed-states
                   {:grubs {"1" {:completed false, :text "2 apples"}}, :recipes {}}
                   {:grubs {"1" {:completed true, :text "2 apples"}}, :recipes {}})
@@ -46,7 +50,7 @@
         out (chan 1)]
     (state/make-server-agent in out states)
     (>!! in msg)
-    (let [response (<!! out)]
+    (let [response (<!!? out)]
       @states => (hashed-states
                   {:grubs {"1" {:text "2 apples" :completed false}} :recipes {}}
                   {:grubs {"1" {:text "2 apples" :completed false}
@@ -76,7 +80,7 @@
         out (chan 1)]
     (state/make-server-agent in out states)
     (>!! in msg)
-    (let [response (<!! out)]
+    (let [response (<!!? out)]
       @states => (hashed-states
                   {:grubs {"1" {:text "2 apples" :completed false}} :recipes {}}
                   {:grubs {"1" {:text "2 apples" :completed false}
@@ -98,7 +102,7 @@
         out (chan 1)]
     (state/make-server-agent in out states)
     (>!! in msg)
-    (let [response (<!! out)]
+    (let [response (<!!? out)]
       @states => (hashed-states
                   {:grubs {"1" {:text "2 apples" :completed false}} :recipes {}}
                   {:grubs {"1" {:text "2 apples" :completed false}
@@ -126,7 +130,7 @@
         out (chan 1)]
     (state/make-server-agent in out states client-state)
     (>!! in msg)
-    (let [response (<!! out)]
+    (let [response (<!!? out)]
       @states => (hashed-states
                   {:grubs {"1" {:text "2 apples" :completed false}} :recipes {}}
                   {:grubs {"1" {:text "2 apples" :completed false}
@@ -163,7 +167,7 @@
     (state/make-server-agent server-in server-out server-states client-shadow)
     (add-watch client-states :test (fn [_ _ _ new-states] (a/put! client-state-changes new-states)))
     (>!! client-in msg)
-    (<!! client-state-changes)
+    (<!!? client-state-changes)
     (:state (last @client-states)) => {:grubs {"1" {:completed true, :text "2 apples"}}
                                        :recipes {}}
     (:state (last @server-states)) => {:grubs {"1" {:completed true, :text "2 apples"}}
@@ -191,7 +195,7 @@
     (state/make-server-agent server-in server-out server-states client-shadow)
     (add-watch client-states :test (fn [_ _ _ new-states] (a/put! client-state-changes new-states)))
     (>!! client-in msg)
-    (<!! client-state-changes)
+    (<!!? client-state-changes)
     @client-states => (hashed-states
                        {:grubs {"1" {:completed false, :text "2 apples"}}, :recipes {}}
                        {:grubs {"1" {:completed true, :text "2 apples"}}, :recipes {}}