[ARVADOS] updated: 7bd04ed26901e34e3e5788093bee12be4406dd7b
git at public.curoverse.com
git at public.curoverse.com
Mon Nov 17 12:40:22 EST 2014
Summary of changes:
apps/workbench/Gemfile | 2 +-
apps/workbench/Gemfile.lock | 12 +-
.../app/assets/javascripts/pipeline_instances.js | 2 +-
.../app/assets/javascripts/select_modal.js | 31 +-
.../app/assets/javascripts/selection.js.erb | 3 +-
.../app/controllers/application_controller.rb | 1 +
.../app/controllers/collections_controller.rb | 39 +--
.../controllers/pipeline_instances_controller.rb | 15 +-
apps/workbench/app/controllers/users_controller.rb | 6 +-
apps/workbench/app/helpers/application_helper.rb | 11 +-
apps/workbench/app/models/arvados_api_client.rb | 7 +-
apps/workbench/app/models/arvados_base.rb | 4 +-
apps/workbench/app/models/arvados_resource_list.rb | 163 ++++++----
.../app/views/application/_choose.html.erb | 7 +-
.../app/views/application/_paging.html.erb | 22 +-
.../app/views/collections/_choose_rows.html.erb | 22 +-
.../app/views/collections/_index_tbody.html.erb | 2 +-
.../collections/_show_chooser_preview.html.erb | 2 +-
.../app/views/collections/_show_files.html.erb | 23 +-
.../app/views/collections/_show_recent.html.erb | 4 +-
.../app/views/layouts/application.html.erb | 2 +-
apps/workbench/app/views/layouts/body.html.erb | 13 -
.../app/views/projects/_show_sharing.html.erb | 3 +-
.../views/users/_manage_virtual_machines.html.erb | 2 +
.../workbench/app/views/users/_show_admin.html.erb | 2 +-
.../pipeline_instances_controller_test.rb | 2 +-
.../test/integration/pipeline_instances_test.rb | 113 ++++---
.../test/unit/arvados_resource_list_test.rb | 97 ++++--
crunch_scripts/run-command | 5 +-
doc/_config.yml | 2 +
doc/api/schema/Job.html.textile.liquid | 13 +-
doc/sdk/cli/index.html.textile.liquid | 53 +---
doc/sdk/cli/install.html.textile.liquid | 42 +++
doc/sdk/cli/subcommands.html.textile.liquid | 252 +++++++++++++++
sdk/cli/bin/arv | 8 +-
sdk/cli/bin/arv-tag | 15 +-
sdk/cli/bin/crunch-job | 91 +++---
sdk/go/keepclient/keepclient.go | 22 +-
sdk/go/keepclient/keepclient_test.go | 124 ++++----
sdk/go/keepclient/root_sorter.go | 57 ++++
sdk/go/keepclient/root_sorter_test.go | 58 ++++
sdk/go/keepclient/support.go | 65 +---
sdk/python/arvados/arvfile.py | 29 ++
sdk/python/arvados/collection.py | 111 +++++--
sdk/python/arvados/keep.py | 198 ++++++------
sdk/python/arvados/retry.py | 10 +-
sdk/python/arvados/stream.py | 121 ++++---
sdk/python/arvados/util.py | 4 +-
sdk/python/setup.py | 1 +
sdk/python/tests/arvados_testutil.py | 42 +++
sdk/python/tests/run_test_server.py | 14 +-
sdk/python/tests/test_collections.py | 287 +++++++----------
sdk/python/tests/test_keep_client.py | 169 +++++++++-
sdk/python/tests/test_retry.py | 4 +-
sdk/python/tests/test_stream.py | 174 +++++++++-
sdk/ruby/arvados.gemspec | 2 +-
.../api/app/controllers/application_controller.rb | 8 +
services/api/app/models/job.rb | 59 ++--
services/api/app/models/node.rb | 55 +++-
services/api/config/application.default.yml | 22 +-
services/api/config/unbound.template | 4 +
...141111133038_add_arvados_sdk_version_to_jobs.rb | 13 +
services/api/db/structure.sql | 7 +-
services/api/lib/load_param.rb | 7 +-
services/api/script/restart-dns-server | 34 ++
services/api/script/restart-dnsmasq | 21 --
services/api/test/fixtures/keep_services.yml | 6 +-
services/api/test/fixtures/links.yml | 14 +
services/api/test/fixtures/pipeline_templates.yml | 39 ++-
services/api/test/fixtures/repositories.yml | 5 +
.../arvados/v1/commits_controller_test.rb | 3 +-
.../arvados/v1/groups_controller_test.rb | 67 ++--
.../arvados/v1/repositories_controller_test.rb | 15 +-
services/api/test/helpers/git_test_helper.rb | 4 +-
services/api/test/integration/keep_proxy_test.rb | 17 +-
services/api/test/test.git.tar | Bin 153600 -> 194560 bytes
services/api/test/unit/job_test.rb | 84 ++++-
services/keepproxy/keepproxy_test.go | 14 +-
.../nodemanager/arvnodeman/computenode/__init__.py | 353 ---------------------
.../computenode/{ => dispatch}/__init__.py | 123 +------
.../arvnodeman/computenode/driver/__init__.py | 64 ++++
.../arvnodeman/computenode/{ => driver}/dummy.py | 3 +-
.../arvnodeman/computenode/{ => driver}/ec2.py | 3 +-
services/nodemanager/arvnodeman/config.py | 5 +-
services/nodemanager/arvnodeman/daemon.py | 13 +-
services/nodemanager/arvnodeman/jobqueue.py | 10 +-
services/nodemanager/arvnodeman/launcher.py | 12 +-
services/nodemanager/doc/ec2.example.cfg | 4 +
services/nodemanager/doc/local.example.cfg | 1 +
services/nodemanager/tests/test_computenode.py | 279 ----------------
...computenode.py => test_computenode_dispatch.py} | 35 +-
...enode_ec2.py => test_computenode_driver_ec2.py} | 2 +-
services/nodemanager/tests/test_daemon.py | 17 +-
services/nodemanager/tests/test_jobqueue.py | 18 ++
94 files changed, 2222 insertions(+), 1803 deletions(-)
create mode 100644 doc/sdk/cli/install.html.textile.liquid
create mode 100644 doc/sdk/cli/subcommands.html.textile.liquid
create mode 100644 sdk/go/keepclient/root_sorter.go
create mode 100644 sdk/go/keepclient/root_sorter_test.go
create mode 100644 sdk/python/arvados/arvfile.py
create mode 100644 services/api/config/unbound.template
create mode 100644 services/api/db/migrate/20141111133038_add_arvados_sdk_version_to_jobs.rb
create mode 100755 services/api/script/restart-dns-server
delete mode 100755 services/api/script/restart-dnsmasq
copy services/nodemanager/arvnodeman/computenode/{ => dispatch}/__init__.py (69%)
create mode 100644 services/nodemanager/arvnodeman/computenode/driver/__init__.py
rename services/nodemanager/arvnodeman/computenode/{ => driver}/dummy.py (96%)
rename services/nodemanager/arvnodeman/computenode/{ => driver}/ec2.py (98%)
copy services/nodemanager/tests/{test_computenode.py => test_computenode_dispatch.py} (89%)
rename services/nodemanager/tests/{test_computenode_ec2.py => test_computenode_driver_ec2.py} (98%)
via 7bd04ed26901e34e3e5788093bee12be4406dd7b (commit)
via 372cff3e04b4243eb68d9ae3e296aebcee459aea (commit)
via d3229c7f727f40436cad66fba5f3345e0b3eede5 (commit)
via 664919d58c3689cd9e0a25547ec1e02d9adda38c (commit)
via 97ddc11818d059e42989f302fa15db4c5e19d5b3 (commit)
via 9a46fb0033514db6dd5e8ab4ccf793f78458a734 (commit)
via d9f45bd01d2f5691a9aaca4f1fc00465497ef00c (commit)
via 7395af3b19b8fc422fe2456c6bead1e7f4c60989 (commit)
via a75ef0985d2a385165168cbb488cf97382308549 (commit)
via 11374252ee3c26240420bb3aa0d0433fad71731f (commit)
via 4c110b5f4e8e92d613f70427f27bdfae2ea376c7 (commit)
via 2ac2528dc0e5b700a2640e28dc66e474db9ad329 (commit)
via 9cd99d3070cd69664a31f8e25fad68fe8b7c43cf (commit)
via 6de0a4ab0323e69a5499e59af03c9c5e6125fed7 (commit)
via 2070784e52d89bbcf636062532a8ce37629737db (commit)
via 59f750a109a706d29862530dc3d282db75736d38 (commit)
via 3a31350c6265cb1135d3d4d40af436aae91a9894 (commit)
via c805714d8bbc51adb32a3a3ae4b82ea41eaa0de0 (commit)
via 9325dabcc2b6c32a589ba86cc052946b4875eb1d (commit)
via 06e402b11ad4d503feb5fa45845cb27c93478cfc (commit)
via afdab87268e4ee2f19f92e02b219696081959378 (commit)
via 809b122ee02d566b3bddb26df928e57efa39ed87 (commit)
via f5c574f45a6352c7d675e8c111eef5083a435213 (commit)
via f81483a374fbdfe6d5f36e5f5e55f92455afa155 (commit)
via 1ac0e3da5fbd477bd2acbf5bd8baa3c86f08194b (commit)
via dff161c1eaaecd6b557e88709fdf5f0dcb52821b (commit)
via cf1db3981ad0c6416d2572ceeb512743a9df24c7 (commit)
via 3894b788440fce678a28b4c7a8780f2b7767449d (commit)
via 5be66e86ac84d7d46c8503c3c136cb144222e4bf (commit)
via fd207a0e0fc3aa02eba81b567b0b30d144ac3fbf (commit)
via 9ef386f6e405db49df44a24e4cdfe5a0c0742f62 (commit)
via d833a28612bb22e1489536b3b0dfe8eb00196fda (commit)
via 754ff84aab18b623b37f21377c639694e6ea0ed7 (commit)
via 1a001045ccce247a13266a5ef619ffbc07308226 (commit)
via 9966893484226206474d7d9936d884cc56582f15 (commit)
via ac21f0d45a76294aaca0c0c0fdf06eb72d03368d (commit)
via a0e70cf1da033f7d94e728ab919bd8cfcabf3743 (commit)
via c28b9b91028c90497455bfde188915982377b825 (commit)
via e158f485053be1e840073b321033d60d686a55a8 (commit)
via 8f9f0dece977ccf5a778f3b3bd2379375e723c18 (commit)
via b626a85eb86fd4909712852040cd305c71c37ee5 (commit)
via 5141c3ee23e89696773e227a93236ef2a51543c2 (commit)
via 45bfc1104dd30fb97a586de5ff96d6b739f7bb2b (commit)
via 6bcb827b1405ce8ca5d767108bc4356ecc2972f4 (commit)
via 093cebc3a4baed645fd5d4a5331c2ff837de8c77 (commit)
via 76c9a858643680d90f9694d49c212a54fe5b759f (commit)
via 53381c90fd5ef26d3a0cc08c8d35318b0b92557a (commit)
via 91f0b180a8474321738577a12250b5a1b8f5bcbc (commit)
via a844af57de33b0094ce23c873d044f15de1ed138 (commit)
via d1cdd7eddf071e41643bc958b77d0056410d01ea (commit)
via 26aa2f1a1c8c9883beac1538c318279190f91c8a (commit)
via 7bf8f6c701e28e574c137b0c942522e8f8ee4d8c (commit)
via 7924077e3db2898de26c86599d9f311e02d6db46 (commit)
via c1d9150de2977f7eb85e7cb058d5c41ae6f06173 (commit)
via b2610e066d569b323fe55ffee615e61ca4e461d1 (commit)
via ee3e85858a60bffc2f132e2f95ba92d1deb78c2c (commit)
via c89f70e34e67642c5e594334a9149afe84490cf0 (commit)
via f34bf1aadbc6c940150518c8c4db38f7fed17282 (commit)
via 0dbc7a3469f687d1a4cef776a57e71e96561ad0d (commit)
via f4ceb0aab5df85254bf8828a74dddbac1cf169d2 (commit)
via 204419e149d2b6b19b3bc2965e1c524b7abd5881 (commit)
via c7b7e4d44e9349c9104fbfcd33c5e4b97fe17a71 (commit)
via e82cddfdbd763db27df889a6e316623df7b9c2a8 (commit)
via e61de9add861db4c043341f3926acb95ded37862 (commit)
via ec75fda0fc2c86a77d831dcd7962ece7a2d6ae6d (commit)
via d9d7af20beb9f9a09eb755e98d5e25f1a6e3e0e7 (commit)
via 1237511f9da5ee20588d44be4db5f9e37cfc6400 (commit)
via 7e8b0267597a52063395d3c258d4d4772d2e2240 (commit)
via ca136c579fc014b6428c18cc3a74a45550539543 (commit)
via a98086e04213ac68394e392761a2911b0e8a000c (commit)
via 69594694568da1abc2bd8e46134da81ec1f2a7c8 (commit)
via fa3e996ee452bd9be853dd9e93aaec15623708f5 (commit)
via 1304e044aa87a65145bf8b6d4bc141586556c0ed (commit)
via 47b0cb35b5ee933757c4342bb75fd286c1dac8cb (commit)
via e02ef893c4f6cf881e449c248782b2ac21b49b0f (commit)
via 9405b5f224b205e681e378bd2d90d18f3638139b (commit)
via a4b55a80251d666ca39d0f8d201c70e493b4c661 (commit)
via 0198b4937df2be79e41ea76ea6c31841441f4f2c (commit)
via 3ee90fd536fbfc9d8d91d5fac7c12d0ebe0df5ab (commit)
via cac035d7a171b90f0dc714d17b500b4062c0c58b (commit)
via fbd2326841005c1a288c65502dc038f26923ed65 (commit)
via 0f9bca457448372de1d15dcd9ed4548c324ff14f (commit)
via 3bbb988777079718338e3e6cb9c6c9b5399be800 (commit)
via 1fa1006e5b21cfc30e694890db969c20864af8c6 (commit)
via 83369774c123b427f519bd2a2229415fac383a6a (commit)
via d3cb9460f0a30f9602508bed7507c906b8a6d91d (commit)
via 1491cdd65b8a3ef75f66516004bc0680651da201 (commit)
via 29e012f772b1c1d4c286e143b50a9de9b8a6918c (commit)
via a5b4a7e8da51d84fe200d88dc39bd5431bb60a11 (commit)
via 723afcb87896a7dcee99bb41b37ef368464f4f40 (commit)
via cffe9566efaa838ada850353dd6e51ec4cc3ebff (commit)
via 88d7932586705439e7a02b403e65202164920660 (commit)
via 1c0e350af2a30f4627ad879545c9c6fc6554d92a (commit)
via 81bfa2fd57ee5e4b0042d418115f0e50170ee5eb (commit)
via 3993ba462c113090bc2db79db30838c017a5aa3b (commit)
via 2361a1b4d619a0f405f98c507cff6219b237bb2e (commit)
via 47530892a8a6b174786316c3881e22dc0864c859 (commit)
via 6ac59725fedc0a958d60d85740b47deb25addb5b (commit)
via 974ad63fc24161cb228003f4ef4cc32d5da578ff (commit)
via 87567c9440a65a42fdde62e513b40dc5a8585fdf (commit)
via c1f7fd8aa615d4a91f919ce18a6085ae766a5517 (commit)
from eee66a4fd87be84379929d17864f244b0a68fd74 (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 7bd04ed26901e34e3e5788093bee12be4406dd7b
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date: Mon Nov 17 18:40:16 2014 +0100
3382: test that after editing that an input is editable a second time
diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 9319fe0..a62f787 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -276,6 +276,33 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
# Create and run a pipeline for 'Two Part Pipeline Template' in 'A Project'
def create_and_run_pipeline_in_aproject in_aproject, template_name, choose_file
+
+ def check_input_inedible(in_aproject, choose_file)
+ find('div.form-group', text: 'Foo/bar pair').
+ find('.btn', text: 'Choose').
+ click
+
+ within('.modal-dialog') do
+ if in_aproject
+ assert_selector 'button.dropdown-toggle', text: 'A Project'
+ wait_for_ajax
+ else
+ assert_selector 'button.dropdown-toggle', text: 'Home'
+ wait_for_ajax
+ click_button "Home"
+ click_link "A Project"
+ wait_for_ajax
+ end
+ first('span', text: 'foo_tag').click
+ if choose_file
+ wait_for_ajax
+ find('.preview-selectable', text: 'foo').click
+ end
+ find('button', text: 'OK').click
+ end
+ wait_for_ajax
+ end
+
# create a pipeline instance
find('.btn', text: 'Run a pipeline').click
within('.modal-dialog') do
@@ -284,33 +311,11 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
end
assert find('p', text: 'Provide a value')
+ check_input_inedible in_aproject, choose_file
- find('div.form-group', text: 'Foo/bar pair').
- find('.btn', text: 'Choose').
- click
-
- within('.modal-dialog') do
- if in_aproject
- assert_selector 'button.dropdown-toggle', text: 'A Project'
- wait_for_ajax
- else
- assert_selector 'button.dropdown-toggle', text: 'Home'
- wait_for_ajax
- click_button "Home"
- click_link "A Project"
- wait_for_ajax
- end
- first('span', text: 'foo_tag').click
- if choose_file
- wait_for_ajax
- find('.preview-selectable', text: 'foo').click
- end
- find('button', text: 'OK').click
- end
- wait_for_ajax
-
- # The input, after being specified, should still be displayed (#3382)
+ # The input, after being specified, should still be displayed and still be editable afterwards (#3382)
assert find('div.form-group', text: 'Foo/bar pair')
+ check_input_inedible in_aproject, choose_file
# Ensure that the collection's portable_data_hash, uuid and name
# are saved in the desired places. (#4015)
commit 372cff3e04b4243eb68d9ae3e296aebcee459aea
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date: Mon Nov 17 18:18:48 2014 +0100
3382: test that an input without a description is still displayed after it has been specified
diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 027616b..9319fe0 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -309,6 +309,9 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
end
wait_for_ajax
+ # The input, after being specified, should still be displayed (#3382)
+ assert find('div.form-group', text: 'Foo/bar pair')
+
# Ensure that the collection's portable_data_hash, uuid and name
# are saved in the desired places. (#4015)
diff --git a/services/api/test/fixtures/pipeline_templates.yml b/services/api/test/fixtures/pipeline_templates.yml
index 8579cf6..260eab8 100644
--- a/services/api/test/fixtures/pipeline_templates.yml
+++ b/services/api/test/fixtures/pipeline_templates.yml
@@ -16,7 +16,6 @@ two_part:
required: true
dataclass: Collection
title: "Foo/bar pair"
- description: "Provide a collection containing at least two files."
part-two:
script: bar
script_version: master
commit d3229c7f727f40436cad66fba5f3345e0b3eede5
Merge: eee66a4 664919d
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date: Mon Nov 17 18:16:06 2014 +0100
Merge branch 'master' into 3382-always-show-inputs
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list