X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/060d38d627bd1e51dd2b3c6e7de9af6aa7d7b6f3..435a5df3e505dfbf67467bd02073f97e63c4c61d:/services/login-sync/test/stubs.rb diff --git a/services/login-sync/test/stubs.rb b/services/login-sync/test/stubs.rb index d7fab3c0db..cf69da6efc 100644 --- a/services/login-sync/test/stubs.rb +++ b/services/login-sync/test/stubs.rb @@ -3,19 +3,10 @@ # SPDX-License-Identifier: AGPL-3.0 require 'etc' -require 'mocha/mini_test' +require 'mocha/minitest' require 'ostruct' module Stubs - # These Etc mocks help only when we run arvados-login-sync in-process. - - def setup - super - ENV['ARVADOS_VIRTUAL_MACHINE_UUID'] = 'testvm2.shell' - Etc.stubs(:to_enum).with(:passwd).returns stubpasswd.map { |x| OpenStruct.new x } - Etc.stubs(:to_enum).with(:group).returns stubgroup.map { |x| OpenStruct.new x } - end - def stubpasswd [{name: 'root', uid: 0}] end @@ -24,10 +15,16 @@ module Stubs [{name: 'root', gid: 0}] end - # These child-ENV tricks help only when we run arvados-login-sync as a subprocess. def setup super + + # These Etc mocks help only when we run arvados-login-sync in-process. + ENV['ARVADOS_VIRTUAL_MACHINE_UUID'] = 'testvm2.shell' + Etc.stubs(:to_enum).with(:passwd).returns stubpasswd.map { |x| OpenStruct.new x } + Etc.stubs(:to_enum).with(:group).returns stubgroup.map { |x| OpenStruct.new x } + + # These child-ENV tricks help only when we run arvados-login-sync as a subprocess. @env_was = Hash[ENV] @tmpdir = Dir.mktmpdir end