[ARVADOS] updated: d89fc97f4a7ee74edcb1a5856fec560c748b9086

[Git user]

Summary of changes:
 apps/workbench/test/integration/download_test.rb | 6 +++---
 sdk/python/tests/run_test_server.py              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  d89fc97f4a7ee74edcb1a5856fec560c748b9086 (commit)
       via  df6708f69b17c85c31b3b9ab5d1763bda3eac071 (commit)
       via  65279d33000f6f505e063699818aabe940b6a367 (commit)
      from  6884eedcf015af4b79857d8a47ef93f844e6d190 (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 d89fc97f4a7ee74edcb1a5856fec560c748b9086
Merge: 6884eed df6708f
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 13 15:17:18 2016 -0400

    Merge branch '9567-keep-web-session-test'
    
    refs #9567


commit df6708f69b17c85c31b3b9ab5d1763bda3eac071
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 13 15:14:14 2016 -0400

    9567: Use longer timeouts for keep-web download tests.

diff --git a/apps/workbench/test/integration/download_test.rb b/apps/workbench/test/integration/download_test.rb
index 8a16fb8..9359475 100644
--- a/apps/workbench/test/integration/download_test.rb
+++ b/apps/workbench/test/integration/download_test.rb
@@ -65,13 +65,13 @@ class DownloadTest < ActionDispatch::IntegrationTest
     within "#collection_files" do
       find('[title~=Download]').click
     end
-    wait_for_download 'w a z', 'w a z'
+    wait_for_download 'w a z', 'w a z', timeout: 6
   end
 
-  def wait_for_download filename, expect_data
+  def wait_for_download filename, expect_data, timeout: 3
     data = nil
     tries = 0
-    while tries < 20
+    while tries < timeout*10
       sleep 0.1
       tries += 1
       data = File.read(DownloadHelper.path.join filename) rescue nil

commit 65279d33000f6f505e063699818aabe940b6a367
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 13 15:05:38 2016 -0400

    9567: Print log messages from keep et al. as they appear, even in jenkins where stdout is not a tty.

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 155bced..8f2d440 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -192,7 +192,7 @@ def _fifo2stderr(label):
             raise
     os.mkfifo(fifo, 0700)
     subprocess.Popen(
-        ['sed', '-e', 's/^/['+label+'] /', fifo],
+        ['stdbuf', '-i0', '-oL', '-eL', 'sed', '-e', 's/^/['+label+'] /', fifo],
         stdout=sys.stderr)
     return fifo
 

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


hooks/post-receive
--