[ARVADOS] updated: df7ddbe4c94700abe695d8799b8fc1db1b48d02d

[git at public.curoverse.com]

Summary of changes:
 services/api/test/integration/websocket_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  df7ddbe4c94700abe695d8799b8fc1db1b48d02d (commit)
      from  888c00d55b2a8beb463c35d5b91818adbba1609d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit df7ddbe4c94700abe695d8799b8fc1db1b48d02d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jul 3 21:04:09 2014 -0400

    Don't set "too long" flag on websocket test timer if the websocket is already
    closed.  Hopefully this will make the tests more robust.  no issue #

diff --git a/services/api/test/integration/websocket_test.rb b/services/api/test/integration/websocket_test.rb
index 002bc28..925d879 100644
--- a/services/api/test/integration/websocket_test.rb
+++ b/services/api/test/integration/websocket_test.rb
@@ -32,7 +32,7 @@ class WebsocketTest < ActionDispatch::IntegrationTest
         opened = true
         if timeout
           EM::Timer.new 4 do
-            too_long = true
+            too_long = true if close_status.nil?
             EM.stop_event_loop
           end
         end

-----------------------------------------------------------------------


hooks/post-receive
--