Functional tests to verify links

[arvados.git] / services / api / app / controllers / arvados / v1 / users_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index 0d22b868ea924ee902fec5e19e1dafa61d41c4fb..ebb5203ee70597bf8862a607ba58139b47b7ab6d 100644 (file)
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -119,8 +119,10 @@ class Arvados::V1::UsersController < ApplicationController
                end
 
                # if just probing, return any object found      
-               if just_probe   
-                       show; return
+               if just_probe 
+                       @object[:email] = nil   
+                       show
+                 return
                end
 
                # create if need be, and then create or update the links as needed 
@@ -224,8 +226,6 @@ class Arvados::V1::UsersController < ApplicationController
                # Look up the given virtual machine just to make sure it really exists.
                begin
                        vm = (vms = VirtualMachine.where(uuid: vm_uuid)) != nil ? vms.first : nil
-               #vm = VirtualMachine.where(uuid: vm_uuid)
-
                        if not vm
                          logger.warn "Could not look up virtual machine with uuid #{vm_uuid.inspect}"
                                return