[ARVADOS] updated: 8bb8e4cfe39e6b44142adca4721ba29467376e1d

[Git user]

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

       via  8bb8e4cfe39e6b44142adca4721ba29467376e1d (commit)
      from  f17a26ca512ae0083ea5ad608ad6cfbb7fd247ee (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 8bb8e4cfe39e6b44142adca4721ba29467376e1d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Jun 21 15:57:23 2016 -0400

    Increase timeout on failing websocket test.  refs #9427

diff --git a/services/api/test/integration/websocket_test.rb b/services/api/test/integration/websocket_test.rb
index 25e7592..98ae103 100644
--- a/services/api/test/integration/websocket_test.rb
+++ b/services/api/test/integration/websocket_test.rb
@@ -383,7 +383,7 @@ class WebsocketTest < ActionDispatch::IntegrationTest
     ws_helper :admin, false do |ws|
       ws.on :open do |event|
         ws.send ({method: 'subscribe', filters: [['object_uuid', 'is_a', 'arvados#human']]}.to_json)
-        EM::Timer.new 3 do
+        EM::Timer.new 6 do
           # Set a time limit on the test because after unsubscribing the server
           # still has to process the next event (and then hopefully correctly
           # decides not to send it because we unsubscribed.)

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


hooks/post-receive
--