[ARVADOS] updated: 8a42d33f69d5e0889d9f390acb4947c20edff33e
git at public.curoverse.com
git at public.curoverse.com
Tue Apr 21 13:17:15 EDT 2015
Summary of changes:
.../app/assets/javascripts/application.js | 6 +
apps/workbench/app/controllers/users_controller.rb | 6 +-
apps/workbench/app/helpers/application_helper.rb | 2 +-
.../views/projects/_show_contents_rows.html.erb | 4 +-
.../test/helpers/collections_helper_test.rb | 2 +
apps/workbench/test/integration/errors_test.rb | 65 +++---
apps/workbench/test/integration/jobs_test.rb | 4 +-
apps/workbench/test/integration/projects_test.rb | 2 +-
apps/workbench/test/test_helper.rb | 2 +-
doc/api/methods/jobs.html.textile.liquid | 6 +-
doc/api/schema/Job.html.textile.liquid | 5 +-
docker/sso/Dockerfile | 3 +-
sdk/ruby/test/sdk_fixtures.rb | 5 +-
sdk/ruby/test/test_keep_manifest.rb | 21 +-
services/api/Gemfile | 1 +
services/api/Gemfile.lock | 4 +
.../app/controllers/arvados/v1/jobs_controller.rb | 13 +-
services/api/app/models/commit.rb | 255 +++++++++++++--------
services/api/app/models/job.rb | 43 +++-
services/api/config/application.default.yml | 2 +
services/api/script/crunch-dispatch.rb | 80 ++++---
.../arvados/v1/commits_controller_test.rb | 98 --------
.../functional/arvados/v1/jobs_controller_test.rb | 41 ++++
services/api/test/helpers/git_test_helper.rb | 30 ++-
services/api/test/test_helper.rb | 1 +
services/api/test/unit/commit_test.rb | 156 ++++++++++++-
services/api/test/unit/job_test.rb | 11 +
27 files changed, 568 insertions(+), 300 deletions(-)
via 8a42d33f69d5e0889d9f390acb4947c20edff33e (commit)
via 2b42046dcdfff733803e18af140706c9e0adadb6 (commit)
via c674deff8855005e39b5ddf230372cb241bc22b3 (commit)
via 916a3a8b0dc64709b32e491cf249fcafe0762e65 (commit)
via 86e078ae126f6651428219c726c34da3bd7f7495 (commit)
via e36e6c4e56b4c0667ee3c75cd20e78382327aee9 (commit)
via 29a1b2c8894db8e6c6b840220b45371c521a17d2 (commit)
via f8e6cb30ca6a3cdb20be47f7a81663d4affd0b7f (commit)
via b3a23a94b826de04ae02b889eba4e71d9a4ee11f (commit)
via 2fe2dca0080d20a257e9d750cd6ca9d094f01a61 (commit)
via 528f9bb789c2c7f5fbf0838732d470a332292901 (commit)
via 0f56ce4b6192c3d8e00d1fcbb9d5a2e1a2d953c9 (commit)
via 430ed273384c153c9c78c653db8e02fd54aa2e4a (commit)
via c550609485691d8107ae364bfc982569f81f1725 (commit)
via 3355f801d1c2bb243e4091a4f31cc83a5a1a5d77 (commit)
via ae34bc2de285f5bce4a3a6537d454a62f2fa52e6 (commit)
via a0993e451f8a5e209df74dc9f8f0e55bdf1c73bd (commit)
via 9ede4c6a9d45033d0874cb3fa8d2356aeae6fa83 (commit)
via 1fe347f8cf77564a791b9f98963fc73ee6802c4f (commit)
via c5cd44ad4ff0b5d65cab30b8eb702ab3e238a499 (commit)
via 4ccec6c3e6e96edc4917f15769a30e187484ee52 (commit)
via de0f310b710c2a05517e231a8b489301300fed11 (commit)
via e9be782d70efaf8c9bf3fc0043d8a17dfe776bfc (commit)
from 17e59fe02aa59b9fbf3b852d2521714782a6d327 (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 8a42d33f69d5e0889d9f390acb4947c20edff33e
Author: Radhika Chippada <radhika at curoverse.com>
Date: Tue Apr 21 13:16:52 2015 -0400
5179: one more test with multilevel manifest text
diff --git a/sdk/ruby/test/sdk_fixtures.rb b/sdk/ruby/test/sdk_fixtures.rb
index 80dfabf..6bf6a9e 100644
--- a/sdk/ruby/test/sdk_fixtures.rb
+++ b/sdk/ruby/test/sdk_fixtures.rb
@@ -54,8 +54,11 @@ module SDKFixtures
NONNORMALIZED_MANIFEST =
["./dir2 #{random_block} 0:0:z 0:0:y 0:0:x",
"./dir1 #{random_block} 0:0:p 0:0:o 0:0:n\n"].join("\n")
- MULTILEVEL_MANIFEST_WITH_DIRS_IN_FILENAMES =
+ MANIFEST_WITH_DIRS_IN_FILENAMES =
[". #{random_block(10)} 0:3:file1 3:3:dir1/file1 6:3:dir1/dir2/file1\n"].join("")
+ MULTILEVEL_MANIFEST_WITH_DIRS_IN_FILENAMES =
+ [". #{random_block(10)} 0:3:file1 3:3:dir1/file1 6:4:dir1/dir2/file1\n",
+ "./dir1 #{random_block(10)} 0:3:file1 3:7:dir2/file1\n"].join("")
### Non-tree manifests
# These manifests follow the spec, but they express a structure that can't
diff --git a/sdk/ruby/test/test_keep_manifest.rb b/sdk/ruby/test/test_keep_manifest.rb
index 18b58ca..70bae3e 100644
--- a/sdk/ruby/test/test_keep_manifest.rb
+++ b/sdk/ruby/test/test_keep_manifest.rb
@@ -209,14 +209,33 @@ class ManifestTest < Minitest::Test
end
end
+ def test_collection_with_dirs_in_filenames
+ manifest = Keep::Manifest.new(MANIFEST_WITH_DIRS_IN_FILENAMES)
+
+ seen = Hash.new { |this, key| this[key] = [] }
+
+ manifest.files.each do |stream, basename, size|
+ refute(seen[stream].include?(basename), "each_file repeated #{stream}/#{basename}")
+ assert_equal(3, size, "wrong size for #{stream}/#{basename}")
+ seen[stream] << basename
+ end
+
+ assert_equal(%w(. ./dir1 ./dir1/dir2), seen.keys)
+
+ seen.each_pair do |stream, basenames|
+ assert_equal(%w(file1), basenames.sort, "wrong file list for #{stream}")
+ end
+ end
+
def test_multilevel_collection_with_dirs_in_filenames
manifest = Keep::Manifest.new(MULTILEVEL_MANIFEST_WITH_DIRS_IN_FILENAMES)
seen = Hash.new { |this, key| this[key] = [] }
+ expected_sizes = {'.' => 3, './dir1' => 6, './dir1/dir2' => 11}
manifest.files.each do |stream, basename, size|
refute(seen[stream].include?(basename), "each_file repeated #{stream}/#{basename}")
- assert_equal(3, size, "wrong size for #{stream}/#{basename}")
+ assert_equal(expected_sizes[stream], size, "wrong size for #{stream}/#{basename}")
seen[stream] << basename
end
commit 2b42046dcdfff733803e18af140706c9e0adadb6
Merge: 17e59fe c674def
Author: Radhika Chippada <radhika at curoverse.com>
Date: Tue Apr 21 12:56:15 2015 -0400
Merge branch 'master' into 5179-dirs-in-filenames
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list