[ARVADOS] updated: df8e6b95f5eec12a73da2a9d756d3c570bc3dabe

[git at public.curoverse.com]

Summary of changes:
 .../app/helpers/pipeline_instances_helper.rb       |  14 +-
 .../views/application/_report_issue_popup.html.erb |   2 +-
 apps/workbench/test/integration/errors_test.rb     |   2 +-
 apps/workbench/test/integration/logins_test.rb     |   6 +
 .../test/integration/pipeline_instances_test.rb    |   2 -
 sdk/python/arvados/errors.py                       |   6 +-
 sdk/python/arvados/keep.py                         | 431 +++++++++++++--------
 sdk/python/arvados/retry.py                        | 140 +++++++
 sdk/python/setup.py                                |   2 +-
 sdk/python/tests/arvados_testutil.py               |   7 +
 sdk/python/tests/test_api.py                       |  15 +-
 sdk/python/tests/test_keep_client.py               | 112 +++++-
 sdk/python/tests/test_retry.py                     | 198 ++++++++++
 13 files changed, 756 insertions(+), 181 deletions(-)
 create mode 100644 sdk/python/arvados/retry.py
 create mode 100644 sdk/python/tests/test_retry.py

       via  df8e6b95f5eec12a73da2a9d756d3c570bc3dabe (commit)
       via  416d88101ba0f218952e092da1873026c6f77271 (commit)
       via  a17b176ea55dc3820ef1bde4b99cf33c628ffbbe (commit)
       via  728ee9775de422840b81827c71c7b515708620a3 (commit)
       via  aa1d003d5ab199498da50c231be3c9219546a692 (commit)
       via  5a043a14a8d321adeb1fc14c9cd6f479f8ea8216 (commit)
       via  dccec0cc48025830ac68cbb4a80f5ae73ace3fa7 (commit)
       via  7f5a0cafa4cc3d3155830243ab9df204b3b48a03 (commit)
       via  adbeb30cc27fa56a4550e28e1fd5e8ec4a1c7836 (commit)
       via  440d863f1643587d37bd21548410f13b655ac021 (commit)
       via  c1b0e1bd832d3c2c96e60334b96f3b6989ecd1b6 (commit)
       via  8cba6b1dd7307bb47c36a51c7aea8bfa78e76c8d (commit)
       via  aa0ae05d87711be4ba005971677d4d28849f08b9 (commit)
      from  536713e6a7c16e7a54eef1c310f15c708cb1f2be (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 df8e6b95f5eec12a73da2a9d756d3c570bc3dabe
Author: radhika <radhika at curoverse.com>
Date:   Tue Aug 26 12:10:05 2014 -0400

    3112: add scrollbar to the report issue popup

diff --git a/apps/workbench/app/views/application/_report_issue_popup.html.erb b/apps/workbench/app/views/application/_report_issue_popup.html.erb
index fbb7a11..56c5393 100644
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -43,7 +43,7 @@
         <br/>
       </div>
 
-      <div class="modal-body" style="overflow-y:auto">
+      <div class="modal-body" style="height: 25em; overflow-y: scroll">
         <div class="form-group">
           <label for="support_email" class="col-sm-4 control-label"> Support email </label>
           <div class="col-sm-8">
diff --git a/apps/workbench/test/integration/errors_test.rb b/apps/workbench/test/integration/errors_test.rb
index de595e3..4210191 100644
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -122,7 +122,7 @@ class ErrorsTest < ActionDispatch::IntegrationTest
       end
 
       # out of the popup now and should be back in the error page
-      assert(page.has_text?('Dashboard'), 'Expected to see dashboard')
+      assert(page.has_text?(/fiddlesticks/i), 'Expected to be in error page after closing report issue popup')
     ensure
       Rails.configuration.arvados_v1_base = original_arvados_v1_base
     end
diff --git a/apps/workbench/test/integration/logins_test.rb b/apps/workbench/test/integration/logins_test.rb
index adc35d0..187786d 100644
--- a/apps/workbench/test/integration/logins_test.rb
+++ b/apps/workbench/test/integration/logins_test.rb
@@ -1,6 +1,12 @@
 require 'integration_helper'
 
 class LoginsTest < ActionDispatch::IntegrationTest
+  setup do
+    headless = Headless.new
+    headless.start
+    Capybara.current_driver = :selenium
+  end
+
   test "login with api_token works after redirect" do
     visit page_with_token('active_trustedclient')
     assert page.has_text?('Recent jobs'), "Missing 'Recent jobs' from page"

commit 416d88101ba0f218952e092da1873026c6f77271
Merge: 536713e a17b176
Author: radhika <radhika at curoverse.com>
Date:   Tue Aug 26 11:42:01 2014 -0400

    Merge branch 'master' into 3112-report-bug


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


hooks/post-receive
--