[ARVADOS] updated: 2e5ac62b550f7dd608cf133ae66ef04f801be76b
git at public.curoverse.com
git at public.curoverse.com
Sun Feb 8 15:54:29 EST 2015
Summary of changes:
.gitignore | 7 +-
apps/workbench/.gitignore | 1 +
apps/workbench/test/test_helper.rb | 126 +++----
doc/sdk/cli/subcommands.html.textile.liquid | 7 +-
sdk/go/arvadosclient/arvadosclient.go | 4 +-
sdk/go/arvadosclient/arvadosclient_test.go | 49 +--
sdk/go/arvadostest/run_servers.go | 123 +++++++
sdk/go/keepclient/keepclient_test.go | 48 +--
sdk/go/keepclient/support.go | 9 -
sdk/python/arvados/collection.py | 27 +-
sdk/python/arvados/commands/put.py | 40 ++-
sdk/python/arvados/errors.py | 2 +
sdk/python/arvados/events.py | 66 ++--
sdk/python/arvados/keep.py | 19 +-
sdk/python/tests/arvados_testutil.py | 35 ++
sdk/python/tests/run_test_server.py | 395 ++++++++++++++-------
sdk/python/tests/test_api.py | 5 +-
sdk/python/tests/test_arv_put.py | 25 +-
sdk/python/tests/test_collections.py | 65 ++--
sdk/python/tests/test_keep_client.py | 68 ++--
sdk/python/tests/test_pipeline_template.py | 9 +-
sdk/python/tests/test_websockets.py | 44 +--
services/api/.gitignore | 1 +
services/api/Gemfile | 2 +-
services/api/app/models/collection.rb | 23 +-
services/api/config/application.default.yml | 1 -
services/api/db/structure.sql | 2 +-
.../arvados/v1/collections_controller_test.rb | 19 +
services/api/test/unit/collection_test.rb | 10 +
services/api/test/websocket_runner.rb | 10 +-
services/fuse/arvados_fuse/__init__.py | 4 +-
services/fuse/tests/test_mount.py | 26 +-
services/keepproxy/keepproxy_test.go | 99 ++----
33 files changed, 831 insertions(+), 540 deletions(-)
create mode 100644 sdk/go/arvadostest/run_servers.go
via 2e5ac62b550f7dd608cf133ae66ef04f801be76b (commit)
via 64c70939c414881de61ac65512701d0ba4068786 (commit)
via d13386351c53a261558052bafd5e2308230cb73b (commit)
via afef0760e7281eb7038778a12575dfc32b3162f3 (commit)
via 71a556d7d2a9484a4f0bda069f1f7915f548683f (commit)
via 9f0f926aa45113a50ed1de737b236e9f69f64079 (commit)
via 8a8450dcb4dfa4fa222e059091bae03c5e45df3f (commit)
via 7939a927a2b0584210d5e8b2fe73f7625858d6bd (commit)
via a94e15cab04a19dcbb02f2e95335e337c8e55036 (commit)
via aa613a590c0b03e90432c25f0190adc99ef4f657 (commit)
via dd72a4de55681da7b5a95ee8b1e659221c48614f (commit)
via 0ea383a2924b37b47f2bc82fbe405fce4a03bd1f (commit)
via 21a824c12633d3775b449ec9b06148546078f1a8 (commit)
via c722a8bba1bd155f3e36ef4402f684e36ea3e5ec (commit)
via 7b9ca2a26b4099e45548d83fc878fe295f2cdc56 (commit)
via 7acac83d2789b36f0e249a3fde9a8d300f15e152 (commit)
via dac304f927000b74d41defcdea26da5d896bfc0c (commit)
via 1a78ca155b741a08fcf8e0e284bc4da273f084c2 (commit)
via 4204a3c2bda7378e8664233d3c2410c5efb95a47 (commit)
via 1147248aa7a30a9a423e7b5b30c6bbb7d4b9bba6 (commit)
via cbf80c08daa5f9099d0821603a128967254709ed (commit)
via 56ad30382d7d4e11cb0160c5f2e30077e1f41c8b (commit)
via b20590222beddb52c8c89294ed3a324c8c7190a2 (commit)
via 13f83b9374e66e4609aff661b467d747067d66c2 (commit)
via 64416e4751edfe6c49c0bed8a7e38071200282d8 (commit)
via 0c8f599d598f36d67daf0e0e39756ba4d064cbd0 (commit)
via d1957808f6e3ccece499ac2f4048d4ef850b262c (commit)
via 1f8fcb0279a7bb2aa9cf1386ff9516da58216d53 (commit)
via 2cf42c27a7e8b37e29462d0b695e24cb6f3ad5ce (commit)
via bd6f17515de33e6eee9631723730fc65125ebad2 (commit)
via 9ae339f1aab32d8473f366c7aaa25633a5a49008 (commit)
via 3d0c0753efb6e2b610d23d16038db218b491a70f (commit)
via 288413d1c5efcf5d207e0556962740a7759891a1 (commit)
via 4470ba26b332cb92d347af00cdb26c716b1a6953 (commit)
via d01477c59395e6d0895fffe0f60cce6bda9bb083 (commit)
via 5c1cee516b4d41a355fd40a538cf695325e0b712 (commit)
via a1ad1f1d7ce5edf62945340c34ba5e22a36f1157 (commit)
via 13181107ecaeaa92e5d96b05270e56b2d807af39 (commit)
via 48580ba7a6608c89e91afad4b73f2861aafbd7b2 (commit)
via 0d32948a1c78385f9305799c5cb47127492c4320 (commit)
via a2e9008a5fcd7669d5cdd33021212ac754288d19 (commit)
via 0507f73ce83c4a53ce8734f21635928a18d228ad (commit)
via cb6a13cdda9c9b8e2c1dbb151c432ec109e14c82 (commit)
via f9a0cb85f62f1053a9fc1216689b75e6081cf3d7 (commit)
via 655b69e4285476fbd9df4a88ea53e02ea93fa349 (commit)
via 774bc42d958174407d74bc3ef44b2840c2f8a05f (commit)
via bed95fb1306b0708ae61d1977984944430f01bca (commit)
from 9b59cd2f10fa44f4cdbf8986b08e92bdde5a62a7 (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 2e5ac62b550f7dd608cf133ae66ef04f801be76b
Merge: 9b59cd2 64c7093
Author: Radhika Chippada <radhika at curoverse.com>
Date: Sun Feb 8 15:54:14 2015 -0500
Merge branch 'master' into 4523-full-text-search
Conflicts:
services/api/test/unit/collection_test.rb
diff --cc services/api/db/structure.sql
index 3622608,5d9e3e5..b7d2ea5
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -2353,6 -2318,4 +2353,6 @@@ INSERT INTO schema_migrations (version
INSERT INTO schema_migrations (version) VALUES ('20150122175935');
+INSERT INTO schema_migrations (version) VALUES ('20150123142953');
+
- INSERT INTO schema_migrations (version) VALUES ('20150203180223');
+ INSERT INTO schema_migrations (version) VALUES ('20150203180223');
diff --cc services/api/test/unit/collection_test.rb
index 89c9de3,1386a25..59f9d3d
--- a/services/api/test/unit/collection_test.rb
+++ b/services/api/test/unit/collection_test.rb
@@@ -82,40 -82,13 +82,50 @@@ class CollectionTest < ActiveSupport::T
end
end
+ test "full text search for collections" do
+ # file_names column does not get populated when fixtures are loaded, hence setup test data
+ act_as_system_user do
+ Collection.create(manifest_text: ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo\n")
+ Collection.create(manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n")
+ Collection.create(manifest_text: ". 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:95:file_in_subdir1\n./subdir2/subdir3 2bbc341c702df4d8f42ec31f16c10120+64+A315d7e7bad2ce937e711fc454fae2d1194d14d64 at 545a9920 0:32:file1.txt 32:32:file2.txt\n./subdir2/subdir3/subdir4 2bbc341c702df4d8f42ec31f16c10120+64+A315d7e7bad2ce937e711fc454fae2d1194d14d64 at 545a9920 0:32:file3.txt 32:32:file4.txt")
+ end
+
+ [
+ ['foo', true],
+ ['foo bar', false], # no collection matching both
+ ['foo&bar', false], # no collection matching both
+ ['foo|bar', true], # works only no spaces between the words
+ ['Gnu public', true], # both prefixes found, though not consecutively
+ ['Gnu&public', true], # both prefixes found, though not consecutively
+ ['file4', true], # prefix match
+ ['file4.txt', true], # whole string match
+ ['filex', false], # no such prefix
+ ['subdir', true], # prefix matches
+ ['subdir2', true],
+ ['subdir2/', true],
+ ['subdir2/subdir3', true],
+ ['subdir2/subdir3/subdir4', true],
+ ['subdir2 file4', true], # look for both prefixes
+ ['subdir4', false], # not a prefix match
+ ].each do |search_filter, expect_results|
+ search_filters = search_filter.split.each {|s| s.concat(':*')}.join('&')
+ results = Collection.where("#{Collection.full_text_tsvector} @@ to_tsquery(?)",
+ "#{search_filters}")
+ if expect_results
+ refute_empty results
+ else
+ assert_empty results
+ end
+ end
+ end
++
+ [0, 2, 4, nil].each do |ask|
+ test "replication_desired reports #{ask or 2} if redundancy is #{ask}" do
+ act_as_user users(:active) do
+ c = collections(:collection_owned_by_active)
+ c.update_attributes redundancy: ask
+ assert_equal (ask or 2), c.replication_desired
+ end
+ end
+ end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list