X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6d8a27a40903f0dc61876947cecc9401edd3a32c..66c13b6055a363cb08197b8c5d040ed9a511c8ca:/apps/workbench/test/functional/collections_controller_test.rb

diff --git a/apps/workbench/test/functional/collections_controller_test.rb b/apps/workbench/test/functional/collections_controller_test.rb
index 50577ede85..ff53777da4 100644
--- a/apps/workbench/test/functional/collections_controller_test.rb
+++ b/apps/workbench/test/functional/collections_controller_test.rb
@@ -188,6 +188,10 @@ class CollectionsControllerTest < ActionController::TestCase
     fakefiledata.expects(:read).twice.with() do |length|
       # Fail the test if read() is called with length>1MiB:
       length < 2**20
+      ## Force the ActionController::Live thread to lose the race to
+      ## verify that @response.body.length actually waits for the
+      ## response (see below):
+      # sleep 3
     end.returns("foo\n", nil)
     fakefiledata.expects(:close)
     foo_file = api_fixture('collections')['foo_file']
@@ -196,5 +200,10 @@ class CollectionsControllerTest < ActionController::TestCase
       uuid: foo_file['uuid'],
       file: foo_file['manifest_text'].match(/ \d+:\d+:(\S+)/)[1]
     }, session_for(:active)
+    # Wait for the whole response to arrive before deciding whether
+    # mocks' expectations were met. Otherwise, Mocha will fail the
+    # test depending on how slowly the ActionController::Live thread
+    # runs.
+    @response.body.length
   end
 end