X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5cc1710b57f98905469225c68d975ad2e3e7e56d..ccc9ae7a1f1e3acf1ec4f1f18006db2b74c4ea95:/services/api/app/controllers/database_controller.rb diff --git a/services/api/app/controllers/database_controller.rb b/services/api/app/controllers/database_controller.rb index 6bcbd52798..8e61d16fa8 100644 --- a/services/api/app/controllers/database_controller.rb +++ b/services/api/app/controllers/database_controller.rb @@ -18,10 +18,10 @@ class DatabaseController < ApplicationController user_uuids = User. where('email is null or (email not like ? and email not like ?)', '%@example.com', '%.example.com'). collect(&:uuid) - fixture_uuids = - YAML::load_file(File.expand_path('../../../test/fixtures/users.yml', - __FILE__)). - values.collect { |u| u['uuid'] } + fnm = File.expand_path('../../../test/fixtures/users.yml', __FILE__) + fixture_uuids = File.open(fnm) do |f| + YAML.safe_load(f, filename: fnm, permitted_classes: [Time]).values.collect { |u| u['uuid'] } + end unexpected_uuids = user_uuids - fixture_uuids if unexpected_uuids.any? logger.error("Running in test environment, but non-fixture users exist: " +