[ARVADOS] updated: 171ac077e7335978007daf8199559290e73b8180

[git at public.curoverse.com]

Summary of changes:
 services/api/test/integration/websocket_test.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

       via  171ac077e7335978007daf8199559290e73b8180 (commit)
      from  e302c2a74072ebe734adfb45fc6b525f299bb9fb (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 171ac077e7335978007daf8199559290e73b8180
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jul 27 09:51:43 2015 -0400

    6451: Validate that 500 error is returned to client.  Tweak code comments.

diff --git a/services/api/test/integration/websocket_test.rb b/services/api/test/integration/websocket_test.rb
index a4133ba..ef24f55 100644
--- a/services/api/test/integration/websocket_test.rb
+++ b/services/api/test/integration/websocket_test.rb
@@ -655,6 +655,7 @@ class WebsocketTest < ActionDispatch::IntegrationTest
 
     ws_helper :admin do |ws|
       ws.on :open do |event|
+        # test that #6451 is fixed (invalid filter crashes websockets)
         ws.send ({method: 'subscribe', filters: [['object_blarg', 'is_a', 'arvados#human']]}.to_json)
       end
 
@@ -677,8 +678,10 @@ class WebsocketTest < ActionDispatch::IntegrationTest
 
     end
 
-    # Try connecting again, test that #6451 is fixed
-    # (invalid filter crashes websockets)
+    assert_equal 3, state
+
+    # Try connecting again, ensure that websockets server is still running and
+    # didn't crash per #6451
     status = nil
     ws_helper :admin do |ws|
       ws.on :open do |event|

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


hooks/post-receive
--