[ARVADOS] updated: 46fac76c9e6e325afcce3e17d51a7c7eb7340e11

[Git user]

Summary of changes:
 services/api/app/models/collection.rb      | 2 +-
 services/api/test/fixtures/collections.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  46fac76c9e6e325afcce3e17d51a7c7eb7340e11 (commit)
      from  32430fd402dc70b32c945c72b0bb73abbe00a913 (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 46fac76c9e6e325afcce3e17d51a7c7eb7340e11
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Mar 29 11:43:20 2017 -0400

    Fix invalid records in API collections test fixture and improve error message
    to include both values.  Incidentally revealed by adding PDH index to
    collections table.  refs #11361

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 6d1a0d5..b45c178 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -163,7 +163,7 @@ class Collection < ArvadosModel
       false
     elsif portable_data_hash[0..31] != computed_pdh[0..31]
       errors.add(:portable_data_hash,
-                 "does not match computed hash #{computed_pdh}")
+                 "'#{portable_data_hash}' does not match computed hash '#{computed_pdh}'")
       false
     else
       # Ignore the client-provided size part: always store
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index 5f7bad8..2f4d5b0 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -562,7 +562,7 @@ collection_with_one_property:
 # The following four collections are used to test combining collections with repeated filenames
 collection_with_repeated_filenames_and_contents_in_two_dirs_1:
   uuid: zzzzz-4zz18-duplicatenames1
-  portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
+  portable_data_hash: f3a67fad3a19c31c658982fb8158fa58+144
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   created_at: 2014-02-03T17:22:54Z
   modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
@@ -574,7 +574,7 @@ collection_with_repeated_filenames_and_contents_in_two_dirs_1:
 
 collection_with_repeated_filenames_and_contents_in_two_dirs_2:
   uuid: zzzzz-4zz18-duplicatenames2
-  portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
+  portable_data_hash: f3a67fad3a19c31c658982fb8158fa58+144
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   created_at: 2014-02-03T17:22:54Z
   modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr

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


hooks/post-receive
--