[ARVADOS] updated: 44d97727200a7efecd115cd01fb520f371ebfe3b
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 19 15:41:55 EDT 2014
Summary of changes:
.../javascripts/{selection.js => selection.js.erb} | 12 +-
apps/workbench/app/assets/javascripts/tab_panes.js | 8 ++
.../app/controllers/projects_controller.rb | 75 ++++++++---
apps/workbench/app/models/arvados_base.rb | 6 +
apps/workbench/app/models/group.rb | 4 +
apps/workbench/app/models/job.rb | 10 +-
.../app/views/application/_content.html.erb | 33 ++---
.../views/application/_job_status_label.html.erb | 2 +-
.../workbench/app/views/application/destroy.js.erb | 1 +
apps/workbench/app/views/application/show.html.erb | 39 ++++++
apps/workbench/app/views/collections/show.html.erb | 18 ---
.../app/views/pipeline_templates/show.html.erb | 2 +-
.../app/views/projects/remove_items.js.erb | 7 +-
apps/workbench/app/views/projects/show.html.erb | 18 ---
.../workbench/app/views/projects/tab_counts.js.erb | 3 +
apps/workbench/config/routes.rb | 1 +
.../workbench/test/integration/collections_test.rb | 19 ++-
apps/workbench/test/integration/projects_test.rb | 9 +-
apps/workbench/test/integration_helper.rb | 6 +-
sdk/cli/bin/crunch-job | 22 ++-
sdk/python/arvados/collection.py | 150 +++++++++++++--------
sdk/python/arvados/commands/_util.py | 12 ++
sdk/python/arvados/commands/keepdocker.py | 55 +++++---
sdk/python/arvados/commands/put.py | 45 ++++---
sdk/python/arvados/keep.py | 30 +++--
sdk/python/arvados/retry.py | 18 +++
sdk/python/arvados/stream.py | 68 ++++++----
sdk/python/arvados/util.py | 4 +-
sdk/python/bin/arv-get | 46 +++----
sdk/python/bin/arv-ls | 21 +--
sdk/python/setup.py | 2 +-
sdk/python/tests/arvados_testutil.py | 11 ++
sdk/python/tests/test_arv_put.py | 8 +-
sdk/python/tests/test_collections.py | 143 +++++++++++++++++++-
sdk/python/tests/test_keep_client.py | 69 +++++-----
sdk/python/tests/test_retry.py | 27 ++++
sdk/python/tests/test_stream.py | 117 ++++++++++++++++
services/api/Gemfile | 4 +-
services/api/Gemfile.lock | 8 +-
...140918141529_change_user_owner_uuid_not_null.rb | 2 +
services/api/db/structure.sql | 3 +-
services/api/script/crunch-dispatch.rb | 24 ++--
services/fuse/arvados_fuse/__init__.py | 108 +++++++++------
services/fuse/bin/arv-mount | 66 ++++-----
services/fuse/setup.py | 2 +-
services/fuse/tests/test_mount.py | 12 +-
46 files changed, 945 insertions(+), 405 deletions(-)
rename apps/workbench/app/assets/javascripts/{selection.js => selection.js.erb} (96%)
create mode 100644 apps/workbench/app/views/projects/tab_counts.js.erb
create mode 100644 sdk/python/tests/test_stream.py
via 44d97727200a7efecd115cd01fb520f371ebfe3b (commit)
via 40b15ddcdcb8314f0a1036de6238d0ca4bfb3e41 (commit)
via 7178ac911e7b160c1348da404b5aa07b9829d3c8 (commit)
via fe59fe52fd8d10f79b863022dbac6426082dfa46 (commit)
via f5fd953bdf34b6a6b7ba698f76b54f21ee47afc8 (commit)
via 5bb258b6e289b97e4bda28ff1b2d50a255339030 (commit)
via 9d724d2028cc942b02f5a3846fc25d46761ce136 (commit)
via 67182ab96a8dda99ffa897a2fb04d361cd73777d (commit)
via 96f5b2d78c60d1a16f51a269270d180b3f9a60a3 (commit)
via 3b10b48b8a76203f75bee5233e3ab8a258803cb9 (commit)
via c23de360ed9e7950d8587a3ddae3c35874e61b50 (commit)
via 84e9ab15e2068b0e0384e05d3839d16b6a71dc51 (commit)
via 4ac75eb713fcd03b45eb1b4929e21897b4aa871b (commit)
via a4ab52b4305023d8c679cc7c3b09361050d167b6 (commit)
via 1da127f1e63485ac225cb16511013094fd7e84f6 (commit)
via 876d1f80e0344989f8b68799918c467fa5a52e19 (commit)
via eb3c3c9eeb73529353ee385385865d6d3dc99913 (commit)
via 8ba7f9450ce51aa4ec8b0944991abe5a692ab4d1 (commit)
via 1f45f7666edec7b10cee415f238931744247b762 (commit)
via cf9b56161704477075cda297b44dae4d9342c24a (commit)
via 1f354e0ba1b5b23c2d36c0cb60451260b29e1d3f (commit)
via 80c57e3536f41d8419f580b577776d85209f6111 (commit)
via 5a9aaf3f32fc0414ae16aed17a77388cf4af9f90 (commit)
via af2c75821456e28875dc8006efb03f38ec1a74b8 (commit)
via 9facc2aeba6770ee80730001ca66bdaec8bde738 (commit)
via 8d554a2734be8bbe015d38a48494f7699f2de439 (commit)
via f51c721f97c6e5ef4fda47e6d0fc45cdd2c2b77d (commit)
via 4154420cdd2a2ac6cdb2cc57357f42513fb287cc (commit)
via 58ccc8f13d66fc3da1aecb392a6698a29958e203 (commit)
via 4c8ec1b2166a81b05b2b6cf5a6fae5b839876802 (commit)
via 3ef64886e9646804ab1c7e06cb5f3b24bbcba651 (commit)
via 210d762a82c4fe3a2445c641513188fce07436e6 (commit)
via 6f2433691034b6e223445c5a047554ee7c6f92c1 (commit)
via db9ccbd2fab6edf279408a6869a2cf2409d5f335 (commit)
via b941bb69fdf0bfd2cc2ce0de82f570e70f7af86c (commit)
via 700fcdd3594713fc2f692d5c3c31474f0c8e14ff (commit)
via 454e8fd7bbe6afdfd5fe9905cd0376741bf5f9a0 (commit)
via 893f659712cd9b742829b17e2cedc822901608ec (commit)
via 451e52c2a7a6ead01e5ebca28e09dd02fcba49da (commit)
via 555c1e920855989e059a4be0503ebb627193f987 (commit)
via aff3c1ad491cf4ce7fe7912eaf17c1109d35faf6 (commit)
via ec48719c7de0d18772b811645956fab87ce14bff (commit)
via c2a7a5a0e1a89d10d286e060374ad9e1b83a24c7 (commit)
via 9126da70d57cdd32938c4b3814fedf2bd1f1db93 (commit)
from a6809bec920bdfdfc03c726d0808e696824289f5 (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 44d97727200a7efecd115cd01fb520f371ebfe3b
Merge: a6809be 40b15dd
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Sep 19 15:40:53 2014 -0400
Merge branch '3187-pipeline-instance-page' into 3605-improved-dashboard
Conflicts:
apps/workbench/app/models/job.rb
diff --cc apps/workbench/app/models/job.rb
index 1006660,1deb13a..a0247ef
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@@ -38,17 -38,13 +38,17 @@@ class Job < ArvadosBas
arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
end
+ def self.queue_size
+ arvados_api_client.api("jobs/", "queue_size", {"_method"=> "GET"})[:queue_size] rescue 0
+ end
+
- def state
- Job::state(self)
- end
-
def self.state job
+ if job.respond_to? :state and job.state
+ return job.state
+ end
+
if not job[:cancelled_at].nil?
- "Canceled"
+ "Cancelled"
elsif not job[:finished_at].nil? or not job[:success].nil?
if job[:success]
"Completed"
diff --cc apps/workbench/test/integration/projects_test.rb
index 7c5f9a6,c0443cc..2a363c5
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@@ -7,10 -7,17 +7,17 @@@ class ProjectsTest < ActionDispatch::In
Capybara.current_driver = Capybara.javascript_driver
end
+ test 'Check collection count for A Project in the tab pane titles' do
+ project_uuid = api_fixture('groups')['aproject']['uuid']
+ visit page_with_token 'active', '/projects/' + project_uuid
+ collection_count = page.all("[data-pk*='collection']").count
+ assert_selector '#Data_collections-tab span', text: "(#{collection_count})"
+ end
+
test 'Find a project and edit its description' do
visit page_with_token 'active', '/'
- find('.arv-project-list a,button', text: 'A Project').
- click
+ find("#projects-menu").click
+ find(".dropdown-menu a", text: "A Project").click
within('.container-fluid', text: api_fixture('groups')['aproject']['name']) do
find('span', text: api_fixture('groups')['aproject']['name']).click
within('.arv-description-as-subtitle') do
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list