puppetlabs/vmfloaty
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmfloaty.git synced 2026-01-26 13:28:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #105 from puppetlabs/dont-require-vmfloaty.yml-list

Browse source 
(maint) Don't require config file for list --active
This commit is contained in:
Gene Liverman 2020-10-09 11:45:13 -04:00 • committed by GitHub
commit 3ce0222b38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/vmfloaty/utils.rb
View file

@ -116,7 +116,7 @@ class Utils
output_target.puts "- [JobID:#{host_data['request']['job']['id']}] <#{host_data['state']}>" output_target.puts "- [JobID:#{host_data['request']['job']['id']}] <#{host_data['state']}>"
host_data['allocated_resources'].each do |allocated_resources, _i| host_data['allocated_resources'].each do |allocated_resources, _i|
if allocated_resources['engine'] == "vmpooler" if allocated_resources['engine'] == "vmpooler" && service.config["vmpooler_fallback"]
vmpooler_service = service.clone vmpooler_service = service.clone
vmpooler_service.silent = true vmpooler_service.silent = true
vmpooler_service.maybe_use_vmpooler vmpooler_service.maybe_use_vmpooler

19
spec/vmfloaty/utils_spec.rb
View file

@ -5,6 +5,11 @@ require 'json'
require 'commander/command' require 'commander/command'
require_relative '../../lib/vmfloaty/utils' require_relative '../../lib/vmfloaty/utils'
# allow changing config in service for tests
class Service
attr_writer :config
end
describe Utils do describe Utils do
describe '#standardize_hostnames' do describe '#standardize_hostnames' do
before :each do before :each do
@ -441,7 +446,7 @@ describe Utils do
end end
let(:default_output_first_line) { "- [JobID:#{hostname}] <allocated>" } let(:default_output_first_line) { "- [JobID:#{hostname}] <allocated>" }
let(:default_output_second_line) { " - #{fqdn} (#{template}, 7.67/48 hours, user: bob, role: agent)" } let(:default_output_second_line) { " - #{fqdn} (#{template})" }
it 'prints output with job id, host, and template' do it 'prints output with job id, host, and template' do
expect(STDOUT).to receive(:puts).with(default_output_first_line) expect(STDOUT).to receive(:puts).with(default_output_first_line)
@ -450,6 +455,16 @@ describe Utils do
subject subject
end end
it 'prints more information when vmpooler_fallback is set output with job id, host, template, lifetime, user and role' do
fallback = {'vmpooler_fallback' => 'vmpooler'}
service.config.merge! fallback
default_output_second_line=" - #{fqdn} (#{template}, 7.67/48 hours, user: bob, role: agent)"
expect(STDOUT).to receive(:puts).with(default_output_first_line)
expect(STDOUT).to receive(:puts).with(default_output_second_line)
subject
end
context 'when print_to_stderr option is true' do context 'when print_to_stderr option is true' do
let(:print_to_stderr) { true } let(:print_to_stderr) { true }
@ -529,7 +544,7 @@ describe Utils do
end end
let(:default_output_first_line) { "- [JobID:#{hostname}] <allocated>" } let(:default_output_first_line) { "- [JobID:#{hostname}] <allocated>" }
let(:default_output_second_line) { " - #{fqdn} (#{template}, 7.67/48 hours, user: bob, role: agent)" } let(:default_output_second_line) { " - #{fqdn} (#{template})" }
let(:default_output_third_line) { " - #{fqdn_ns} (#{template_ns})" } let(:default_output_third_line) { " - #{fqdn_ns} (#{template_ns})" }
it 'prints output with job id, host, and template' do it 'prints output with job id, host, and template' do