[ARVADOS] updated: 6cd9106d48845dbb7ff1ab22ae1d48a742e0d108
git at public.curoverse.com
git at public.curoverse.com
Mon Feb 16 16:51:53 EST 2015
Summary of changes:
COPYING | 2 +-
apps/workbench/app/assets/javascripts/event_log.js | 312 ---------------------
.../javascripts/{event_log.js => job_log_graph.js} | 79 +-----
.../app/controllers/collections_controller.rb | 17 +-
apps/workbench/app/views/jobs/_show_log.html.erb | 1 +
.../controllers/collections_controller_test.rb | 60 ++++
.../test/integration/anonymous_access_test.rb | 19 +-
apps/workbench/test/integration/websockets_test.rb | 14 +-
doc/api/schema/Collection.html.textile.liquid | 11 +-
sdk/python/arvados/commands/put.py | 22 +-
sdk/python/tests/arvados_testutil.py | 29 +-
sdk/python/tests/run_test_server.py | 4 +-
sdk/python/tests/test_arv_put.py | 12 +-
sdk/python/tests/test_collections.py | 4 +-
.../controllers/arvados/v1/groups_controller.rb | 2 +-
.../controllers/arvados/v1/schema_controller.rb | 6 +
.../api/app/models/api_client_authorization.rb | 4 +
services/api/app/models/arvados_model.rb | 4 +
services/api/app/models/collection.rb | 75 +++--
services/api/config/application.default.yml | 6 +-
...20150206230342_rename_replication_attributes.rb | 30 ++
services/api/db/structure.sql | 19 +-
services/api/lib/load_param.rb | 12 +-
services/api/test/fixtures/collections.yml | 79 ++++++
.../arvados/v1/collections_controller_test.rb | 37 ++-
.../api/test/integration/collections_api_test.rb | 22 +-
services/api/test/integration/groups_test.rb | 21 +-
services/api/test/unit/arvados_model_test.rb | 2 +-
services/api/test/unit/collection_test.rb | 113 +++++++-
services/fuse/arvados_fuse/__init__.py | 26 +-
services/fuse/setup.py | 2 +-
services/fuse/tests/test_mount.py | 21 +-
.../arvnodeman/computenode/dispatch/__init__.py | 2 +-
services/nodemanager/arvnodeman/config.py | 3 +-
services/nodemanager/setup.py | 2 +-
.../nodemanager/tests/test_computenode_dispatch.py | 22 +-
services/nodemanager/tests/testutil.py | 6 +-
37 files changed, 592 insertions(+), 510 deletions(-)
copy apps/workbench/app/assets/javascripts/{event_log.js => job_log_graph.js} (83%)
create mode 100644 services/api/db/migrate/20150206230342_rename_replication_attributes.rb
via 6cd9106d48845dbb7ff1ab22ae1d48a742e0d108 (commit)
via d87717b4ec885059183ef6d7fa6780c343338455 (commit)
via daaeb7a23e8a5baf82e3af0f280856862dbc5aa7 (commit)
via eff37344f3cecd5aed259c9852aca4bdcdfb6922 (commit)
via fd172dd6875c8bf1481c6e078590c0ccef934bca (commit)
via 5e003c8f9cf47a5bb716dcb75b8e6b98e4680a4c (commit)
via f842b72b9e2bb50a68ba388922c55f54ad0399ae (commit)
via 8b90f80efca772efd2697ffc70d7809c32564171 (commit)
via ef4e4a34213975ed9c1dcd9d4a2efb26f51d027a (commit)
via 7b877a2be249c5e4ab9ab5d73cb68906ca3113d8 (commit)
via 0cefa4c0f3c1b16884b04d6273bd8730166d69ba (commit)
via 4c5352de29ca583c41d9babf795983ee4ea3b78e (commit)
via 11e1ee67236b1dda5dac5e871ecfedd7de8faccf (commit)
via 1e423bd9887adad61999503771b0794fc62efc28 (commit)
via 938338a385a96066552aea6230d773a17cbf3c3e (commit)
via 7ef27804d92e2c38ff6b22aab4b113b3e1817bf5 (commit)
via 1f7a6b50cabab4c8645dd6db92e456c080f2a81c (commit)
via 08c575dc24bbc5732a5fcb1126c23d9a4ca10b73 (commit)
via 23c1bc62ea3644636c0edce8ccee39f2094db190 (commit)
via 175c31a1cc695285c035ca2a54d5b964ab4b1d5f (commit)
via e1999050ade633163524cd9d87d0b77f8b5bdfdc (commit)
via da298b0d96a1e49a1330a4486dcbe22d92d1d743 (commit)
via d27fd3e2648e47f014f7da67056825aca3724004 (commit)
via 4106786a571e8d919e474d8ae205c3b2c9042b26 (commit)
via cc5699578c16dfb96911b8abcd1b35b8ec0ed7c0 (commit)
via 1128f6e0d62f71f4ee91ab609c918ae5bb291edd (commit)
via 1bcfe8651af341c6e7cd01a19443c7c288efa932 (commit)
via d5809a1e62e1b1a3984fff88118e036b1f174ff1 (commit)
via 50df4956c5b0e93efd781fbb070d9d5d30d39eda (commit)
via 606375516f678222465f2643b8162c6973bb28d2 (commit)
via 398a5ef03226f2f3ba06b6ad05a61f3a4b403cf7 (commit)
via 820ce7ad92cba95587800a275e14bbf24670898f (commit)
via 91abe2648d8ca1a3a5185e94beb505ad33db9e2c (commit)
via 61fd9276456c112a4e22273227b0feafed35530f (commit)
via d302307a4a66867419722034228823d1fc3910a6 (commit)
via d62b73382398808a440f15fdda2eea2e15e44282 (commit)
via 966bd97704f635315ab7ba50f23590a5fc9a97be (commit)
via ec0c0f54da513b2b8221d65d9a2c621a7d95d79e (commit)
via 353a72e637532f2641e55c79edc0de52e2dd3508 (commit)
via 26d0d60ce820b3b30d6645839c9c1af354e7498d (commit)
via 46efb1e7f49d08095a6a49a4c6aff045c5eb6f16 (commit)
via f5a0a6337d620ac12f7fffea65d0803d46dcb87e (commit)
via 78596140bd879feb2eacd899060e5ab75a5c94f3 (commit)
via 2d7883822203e66afee1a36c7e86a844bc23719c (commit)
from 7eae56ffb9db24d6cdbc931b29453f2f7bfa1618 (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 6cd9106d48845dbb7ff1ab22ae1d48a742e0d108
Merge: 7eae56f d87717b
Author: Radhika Chippada <radhika at curoverse.com>
Date: Mon Feb 16 16:51:42 2015 -0500
Merge branch 'master' into 4759-timestamp-precision
Conflicts:
services/api/test/integration/collections_api_test.rb
diff --cc services/api/db/structure.sql
index e2c6b66,756dfc9..afc0351
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -1304,7 -1303,7 +1303,7 @@@ CREATE INDEX authorized_keys_search_ind
-- Name: collection_owner_uuid_name_unique; Type: INDEX; Schema: public; Owner: -; Tablespace:
--
--CREATE UNIQUE INDEX collection_owner_uuid_name_unique ON collections USING btree (owner_uuid, name);
++CREATE UNIQUE INDEX collection_owner_uuid_name_unique ON collections USING btree (owner_uuid, name) WHERE (expires_at IS NULL);
--
@@@ -2357,4 -2356,6 +2356,8 @@@ INSERT INTO schema_migrations (version
INSERT INTO schema_migrations (version) VALUES ('20150203180223');
- INSERT INTO schema_migrations (version) VALUES ('20150206210804');
+ INSERT INTO schema_migrations (version) VALUES ('20150206210804');
+
-INSERT INTO schema_migrations (version) VALUES ('20150206230342');
++INSERT INTO schema_migrations (version) VALUES ('20150206230342');
++
++INSERT INTO schema_migrations (version) VALUES ('20150216193428');
diff --cc services/api/test/integration/collections_api_test.rb
index 1a9e7a2,4251047..bf9fec1
--- a/services/api/test/integration/collections_api_test.rb
+++ b/services/api/test/integration/collections_api_test.rb
@@@ -275,28 -274,24 +274,49 @@@ class CollectionsApiTest < ActionDispat
end
end
+ test "create and get collection with properties" do
+ # create collection to be searched for
+ signed_manifest = Collection.sign_manifest(". bad42fa702ae3ea7d888fef11b46f450+44 0:44:my_test_file.txt\n", api_token(:active))
+ post "/arvados/v1/collections", {
+ format: :json,
+ collection: {manifest_text: signed_manifest}.to_json,
+ }, auth(:active)
+ assert_response 200
+ assert_not_nil json_response['uuid']
+ assert_not_nil json_response['properties']
+ assert_empty json_response['properties']
+
+ # update collection's description
+ put "/arvados/v1/collections/#{json_response['uuid']}", {
+ format: :json,
+ collection: { properties: {'property_1' => 'value_1'} }
+ }, auth(:active)
+ assert_response :success
+ assert_equal 'value_1', json_response['properties']['property_1']
+ end
++
+ test "verify modified_at time format after create, update, and get" do
+ # create collection
+ signed_manifest = Collection.sign_manifest(". bad42fa702ae3ea7d888fef11b46f450+44 0:44:my_test_file.txt\n", api_token(:active))
+ post "/arvados/v1/collections", {
+ format: :json,
+ collection: {manifest_text: signed_manifest}.to_json,
+ }, auth(:active)
+ assert_response :success
+ assert_match /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6}/, json_response['modified_at']
+ created = json_response
+
+ # update the collection's manifest text
+ signed_manifest = Collection.sign_manifest(". bad42fa702ae3ea7d888fef11b46f450+44 0:44:my_updated_test_file.txt\n", api_token(:active))
+ put "/arvados/v1/collections/#{created['uuid']}", {
+ format: :json,
+ collection: {manifest_text: signed_manifest}.to_json,
+ }, auth(:active)
+ assert_response :success
+ assert_match /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6}/, json_response['modified_at']
+
+ # search using filename
+ search_result = search_using_filter 'my_updated_test_file.txt', 1
+ assert_match /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6}/, search_result['modified_at']
+ end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list