[ARVADOS] created: f5588e5c01baf3084ad42d8be506c4698b1affce

[git at public.curoverse.com]

        at  f5588e5c01baf3084ad42d8be506c4698b1affce (commit)


commit f5588e5c01baf3084ad42d8be506c4698b1affce
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 14 14:41:39 2015 -0500

    4523: Clear up manifest-signing vs. locator-signing.

diff --git a/services/api/test/integration/collections_api_test.rb b/services/api/test/integration/collections_api_test.rb
index 703b4e9..bea76aa 100644
--- a/services/api/test/integration/collections_api_test.rb
+++ b/services/api/test/integration/collections_api_test.rb
@@ -158,10 +158,10 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
 
   test "create collection, update manifest, and search with filename" do
     # create collection
-    signed_locator = Collection.sign_manifest("0:44:my_test_file.txt\n", api_token(:active))
+    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_locator} 0:44:my_test_file.txt\\n\"}"
+      collection: {manifest_text: signed_manifest}.to_json,
     }, auth(:active)
     assert_response :success
     assert_equal true, json_response['manifest_text'].include?('my_test_file.txt')
@@ -172,10 +172,10 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
     search_using_filter 'my_test_file.txt', 1
 
     # update the collection's manifest text
-    signed_locator = Collection.sign_manifest("0:44:my_updated_test_file.txt\n", api_token(:active))
+    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_locator} 0:44:my_updated_test_file.txt\\n\"}"
+      collection: {manifest_text: signed_manifest}.to_json,
     }, auth(:active)
     assert_response :success
     assert_equal created['uuid'], json_response['uuid']

-----------------------------------------------------------------------


hooks/post-receive
--