From ab26a9efdb841318959abf2a263d3542da3b182e Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 30 Oct 2019 20:14:54 -0400 Subject: [PATCH] Fix typo. No issue # Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- sdk/python/arvados/commands/arv_copy.py | 9 +++++---- services/api/app/models/user.rb | 2 +- services/api/test/unit/user_test.rb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sdk/python/arvados/commands/arv_copy.py b/sdk/python/arvados/commands/arv_copy.py index 8850d0bfd5..0ba3f0a483 100755 --- a/sdk/python/arvados/commands/arv_copy.py +++ b/sdk/python/arvados/commands/arv_copy.py @@ -642,10 +642,11 @@ def create_collection_from(c, src, dst, args): # def copy_collection(obj_uuid, src, dst, args): if arvados.util.keep_locator_pattern.match(obj_uuid): - # If the obj_uuid is a portable data hash, it might not be uniquely - # identified with a particular collection. As a result, it is - # ambigious as to what name to use for the copy. Apply some heuristics - # to pick which collection to get the name from. + # If the obj_uuid is a portable data hash, it might not be + # uniquely identified with a particular collection. As a + # result, it is ambiguous as to what name to use for the copy. + # Apply some heuristics to pick which collection to get the + # name from. srccol = src.collections().list( filters=[['portable_data_hash', '=', obj_uuid]], order="created_at asc" diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb index 564274bc99..50ecc6b65d 100644 --- a/services/api/app/models/user.rb +++ b/services/api/app/models/user.rb @@ -426,7 +426,7 @@ class User < ArvadosModel if !primary_user primary_user = user.redirects_to elsif primary_user.uuid != user.redirects_to.uuid - raise "Ambigious email address, directs to both #{primary_user.uuid} and #{user.redirects_to.uuid}" + raise "Ambiguous email address, directs to both #{primary_user.uuid} and #{user.redirects_to.uuid}" end end end diff --git a/services/api/test/unit/user_test.rb b/services/api/test/unit/user_test.rb index 28685267b7..adc37cc595 100644 --- a/services/api/test/unit/user_test.rb +++ b/services/api/test/unit/user_test.rb @@ -843,7 +843,7 @@ class UserTest < ActiveSupport::TestCase assert_equal "Baratheon", nbs.last_name end - test "fail when email address is ambigious" do + test "fail when email address is ambiguous" do User.register({"email" => "active-user@arvados.local"}) u = User.register({"email" => "never-before-seen-user@arvados.local"}) u.email = "active-user@arvados.local" -- 2.30.2