3410: Update comments.

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index f40508e8939d98a5a2847d9c8c0d77e32d5a12d2..1e8d79fcd679d1f4cb6b82ac61e55a519484314d 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -246,6 +246,6 @@ common:
   # server is using a self-signed cert.
   sso_insecure: false
 
-  # Set replication level for collections whose replication_desired
-  # attribute is nil.
+  # Default replication level for collections. This is used when a
+  # collection's replication_desired attribute is nil.
   default_collection_replication: 2

diff --git a/services/api/db/migrate/20150206230342_rename_replication_attributes.rb b/services/api/db/migrate/20150206230342_rename_replication_attributes.rb
index e1519a3aab67ca975c8bcdf2d141e1ebf6dd3002..23f0ffcffae7fb949fd3f49d2fb3d6e235de5ce9 100644 (file)
--- a/services/api/db/migrate/20150206230342_rename_replication_attributes.rb
+++ b/services/api/db/migrate/20150206230342_rename_replication_attributes.rb
@@ -10,7 +10,7 @@ class RenameReplicationAttributes < ActiveRecord::Migration
     remove_column :collections, :redundancy_confirmed_by_client_uuid
     Collection.reset_column_information
 
-    # Removing that column dropped some indexes. Let's put them back.
+    # Removing that column dropped some search indexes. Let's put them back.
     add_index :collections, ["owner_uuid", "modified_by_client_uuid", "modified_by_user_uuid", "portable_data_hash", "uuid", "name", "file_names"], name: 'collections_search_index'
     execute "CREATE INDEX collections_full_text_search_idx ON collections USING gin(#{Collection.full_text_tsvector});"
   end

diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index 3f848f6811bc09d89adc14cc1deda5a22c131075..c14650c2f469ceff1a7b1fe1bb670428d09b698b 100644 (file)
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -403,7 +403,7 @@ replication_undesired_unconfirmed:
   updated_at: 2015-02-07 00:19:28.596236608 Z
   uuid: zzzzz-4zz18-wjxq7uzx2m9jj4a
   manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
-  name: replication wantnull havenull
+  name: replication want=null have=null
 
 replication_desired_2_unconfirmed:
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
@@ -417,7 +417,7 @@ replication_desired_2_unconfirmed:
   updated_at: 2015-02-07 00:21:35.050126576 Z
   uuid: zzzzz-4zz18-3t236wrz4769h7x
   manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
-  name: replication want2 havenull
+  name: replication want=2 have=null
 
 replication_desired_2_confirmed_2:
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
@@ -431,7 +431,7 @@ replication_desired_2_confirmed_2:
   updated_at: 2015-02-07 00:24:52.983381227 Z
   uuid: zzzzz-4zz18-434zv1tnnf2rygp
   manifest_text: ". acbd18db4cc2f85cedef654fccc4a4d8+3 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 3:6:bar\n"
-  name: replication want2 have2
+  name: replication want=2 have=2
 
 # Test Helper trims the rest of the file
 

diff --git a/services/api/test/unit/collection_test.rb b/services/api/test/unit/collection_test.rb
index 6a3225e68f9c15414c8c8dd870d2444bc7b7a098..f158cfe801c3ad87c320f7cf8a734bdac47cfe71 100644 (file)
--- a/services/api/test/unit/collection_test.rb
+++ b/services/api/test/unit/collection_test.rb
@@ -163,7 +163,7 @@ class CollectionTest < ActiveSupport::TestCase
       assert_raise ArvadosModel::PermissionDeniedError do
         c.update_attributes replication_confirmed_at: Time.now
       end
-      # Cannot set both at once.
+      # Cannot set both at once, either.
       assert_raise ArvadosModel::PermissionDeniedError do
         c.update_attributes(replication_confirmed: 1,
                             replication_confirmed_at: Time.now)