Fix a nil check

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index 04d0db789ad3ca5f6a42a3a3e780b08f8e73c668..0d22b868ea924ee902fec5e19e1dafa61d41c4fb 100644 (file)
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -185,7 +185,7 @@ class Arvados::V1::UsersController < ApplicationController
        
        # link the repo_name passed
        def create_user_repo_link(repo_name)
-               if !repo_name
+               if not repo_name
                        logger.warn ("Repository name not given for #{@object[:uuid]}. Skip creating the link")
                        return
                end
@@ -226,7 +226,7 @@ class Arvados::V1::UsersController < ApplicationController
                        vm = (vms = VirtualMachine.where(uuid: vm_uuid)) != nil ? vms.first : nil
                #vm = VirtualMachine.where(uuid: vm_uuid)
 
-                       if [] == vm
+                       if not vm
                          logger.warn "Could not look up virtual machine with uuid #{vm_uuid.inspect}"
                                return
                        end

diff --git a/services/api/test/functional/arvados/v1/users_controller_test.rb b/services/api/test/functional/arvados/v1/users_controller_test.rb
index a2b282cc0416981164e88a5121cf54c631b62ecf..4e04363f3087dc0a7ce665b75ab5734ae81299d5 100644 (file)
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -68,7 +68,6 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
     }
     assert_response :success
     created = JSON.parse(@response.body)
-puts "created = #{created}"
     assert_equal 'in_create_test_first_name', created['first_name']
     assert_not_nil created['uuid'], 'expected non-null uuid for the newly created user'
     assert_not_nil created['email'], 'since email was given, expected non-nil email'