[ARVADOS] updated: 6c51f11ab5affb4023762227ffb53a5be11a1003
Git user
git at public.curoverse.com
Wed Jun 21 11:35:45 EDT 2017
Summary of changes:
.../app/controllers/collections_controller.rb | 6 ++-
apps/workbench/test/integration/download_test.rb | 15 ++++---
sdk/python/arvados/commands/put.py | 18 ++++++--
sdk/python/tests/run_test_server.py | 17 ++++----
sdk/python/tests/test_arv_put.py | 38 +++++++++++++++-
.../app/controllers/arvados/v1/users_controller.rb | 36 ++++------------
.../functional/arvados/v1/users_controller_test.rb | 20 ---------
services/api/test/integration/users_test.rb | 9 +++-
.../arvnodeman/computenode/driver/ec2.py | 19 +++++++-
services/nodemanager/arvnodeman/daemon.py | 2 +-
.../nodemanager/arvnodeman/test/fake_driver.py | 32 +++++++++++++-
services/nodemanager/setup.py | 6 +--
.../tests/test_computenode_driver_ec2.py | 50 ++++++++++++++++++++++
services/nodemanager/tests/testutil.py | 3 +-
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 2 +-
15 files changed, 196 insertions(+), 77 deletions(-)
via 6c51f11ab5affb4023762227ffb53a5be11a1003 (commit)
via 014d7fdf7ce27777dae18588beb07e4e96625d26 (commit)
via 26964109a599de6def966183b63b714e21084358 (commit)
via b1f94004653da79774a8c9afd641ab7b492398a6 (commit)
via f054bc3d7d3d26962e62c2ea7c27214b08e85bb6 (commit)
via 9e575bce7c0757f270b584d434d2ada5bc98bc3d (commit)
via 02c1d68ab5eeafffb09482d0432f8c4a6cb6dfca (commit)
via 9c6aa66e38395f4ca658a258d27fee2c05c595e2 (commit)
via eca14e106a73ebe62f5aa0fc3060ade2d42f8e20 (commit)
via a249cd98f534ab0a1cba1345b33142f438b7d0f6 (commit)
via 74b3ad1f061185ca695e8bbead723b5212bbb06a (commit)
via 04efddf61ee4a0e5c65a72a538fe3f026ae94e8e (commit)
via 5598bbc3c71da60b7b7a665b36495b957d6a3c52 (commit)
via 9ca7acc39ed2e1e2100869e17be3e5cff7c835b6 (commit)
via cf9874c59fa5a73d395743aaf71555b441161e3e (commit)
via 62a1c9045b8313cc7e1b6be16ab922e3eff1bcfd (commit)
from e7dc406d4babf0fae50837c7f0040dc485242e36 (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 6c51f11ab5affb4023762227ffb53a5be11a1003
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jun 21 11:25:39 2017 -0400
8784: Fix service discovery race in tests (send SIGHUP to keep-web).
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index cca51b8..8a8f7ad 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -493,14 +493,15 @@ def run_keep(blob_signing_key=None, enforce_permissions=False, num_servers=2):
'keep_disk': {'keep_service_uuid': svc['uuid'] }
}).execute()
- # If keepproxy is running, send SIGHUP to make it discover the new
- # keepstore services.
- proxypidfile = _pidfile('keepproxy')
- if os.path.exists(proxypidfile):
- try:
- os.kill(int(open(proxypidfile).read()), signal.SIGHUP)
- except OSError:
- os.remove(proxypidfile)
+ # If keepproxy and/or keep-web is running, send SIGHUP to make
+ # them discover the new keepstore services.
+ for svc in ('keepproxy', 'keep-web'):
+ pidfile = _pidfile('keepproxy')
+ if os.path.exists(pidfile):
+ try:
+ os.kill(int(open(pidfile).read()), signal.SIGHUP)
+ except OSError:
+ os.remove(pidfile)
def _stop_keep(n):
kill_server_pid(_pidfile('keep{}'.format(n)))
commit 014d7fdf7ce27777dae18588beb07e4e96625d26
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jun 21 11:24:59 2017 -0400
8784: Skip redundant arv-put invocations.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>
diff --git a/apps/workbench/test/integration/download_test.rb b/apps/workbench/test/integration/download_test.rb
index a19cde3..1098240 100644
--- a/apps/workbench/test/integration/download_test.rb
+++ b/apps/workbench/test/integration/download_test.rb
@@ -4,6 +4,8 @@ require 'helpers/download_helper'
class DownloadTest < ActionDispatch::IntegrationTest
include KeepWebConfig
+ @@wrote_test_data = false
+
setup do
use_keep_web_config
@@ -13,10 +15,13 @@ class DownloadTest < ActionDispatch::IntegrationTest
# Keep data isn't populated by fixtures, so we have to write any
# data we expect to read.
- ['foo', 'w a z', "Hello world\n"].each do |data|
- md5 = `echo -n #{data.shellescape} | arv-put --no-progress --raw -`
- assert_match /^#{Digest::MD5.hexdigest(data)}/, md5
- assert $?.success?, $?
+ if !@@wrote_test_data
+ ['foo', 'w a z', "Hello world\n"].each do |data|
+ md5 = `echo -n #{data.shellescape} | arv-put --no-progress --raw -`
+ assert_match /^#{Digest::MD5.hexdigest(data)}/, md5
+ assert $?.success?, $?
+ end
+ @@wrote_test_data = true
end
end
commit 26964109a599de6def966183b63b714e21084358
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jun 21 09:59:00 2017 -0400
8784: Use keep-web to serve dir listings for shared collections.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>
diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index dc9ed43..b6112ac 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -111,6 +111,10 @@ class CollectionsController < ApplicationController
end
def show_file_links
+ if Rails.configuration.keep_web_url || Rails.configuration.keep_web_download_url
+ # show_file will redirect to keep-web's directory listing
+ return show_file
+ end
Thread.current[:reader_tokens] = [params[:reader_token]]
return if false.equal?(find_object_by_uuid)
render layout: false
@@ -416,7 +420,7 @@ class CollectionsController < ApplicationController
uri.path += 't=' + opts[:path_token] + '/'
end
uri.path += '_/'
- uri.path += URI.escape(file)
+ uri.path += URI.escape(file) if file
query = Hash[URI.decode_www_form(uri.query || '')]
{ query_token: 'api_token',
diff --git a/apps/workbench/test/integration/download_test.rb b/apps/workbench/test/integration/download_test.rb
index e980b2f..a19cde3 100644
--- a/apps/workbench/test/integration/download_test.rb
+++ b/apps/workbench/test/integration/download_test.rb
@@ -25,7 +25,7 @@ class DownloadTest < ActionDispatch::IntegrationTest
uuid_or_pdh = api_fixture('collections')['foo_file'][id_type]
token = api_fixture('api_client_authorizations')['active_all_collections']['api_token']
visit "/collections/download/#{uuid_or_pdh}/#{token}/"
- within "#collection_files" do
+ within 'ul' do
click_link 'foo'
end
assert_no_selector 'a'
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list