From 3ac0a255576155a4851152d40930d759f600a6e7 Mon Sep 17 00:00:00 2001 From: Dimitri Tischenko Date: Tue, 19 Sep 2023 12:46:35 +0100 Subject: [PATCH] fix rubocop and spec issues --- lib/vmpooler/pool_manager.rb | 2 ++ spec/unit/pool_manager_spec.rb | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 6da5d28..ef2fccb 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -162,8 +162,10 @@ module Vmpooler def get_provisioning_trace(vm, pool, provider) # only call get_provisioning_trace if the provider supports it return nil unless provider.respond_to?(:get_provisioning_trace) + trace = provider.get_provisioning_trace(vm, pool) return nil if trace.nil? + trace end diff --git a/spec/unit/pool_manager_spec.rb b/spec/unit/pool_manager_spec.rb index 3ca075e..85e5013 100644 --- a/spec/unit/pool_manager_spec.rb +++ b/spec/unit/pool_manager_spec.rb @@ -215,7 +215,7 @@ EOT it 'calls fail_pending_vm if host is not ready' do redis_connection_pool.with do |redis| expect(provider).to receive(:vm_ready?).with(pool, vm, redis).and_return(false) - expect(subject).to receive(:fail_pending_vm).with(vm, pool, timeout, timeout_notification, redis) + expect(subject).to receive(:fail_pending_vm).with(vm, pool, timeout, timeout_notification, redis, provider) end subject._check_pending_vm(vm, pool, timeout, timeout_notification, provider) @@ -276,7 +276,7 @@ EOT it 'takes no action if VM is not cloning' do redis_connection_pool.with do |redis| expect(logger).to_not receive(:log) - expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis)).to eq(true) + expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, provider)).to eq(true) end end @@ -284,7 +284,7 @@ EOT redis_connection_pool.with do |redis| redis.hset("vmpooler__vm__#{vm}", 'clone',Time.now.to_s) expect(logger).to_not receive(:log) - expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis)).to eq(true) + expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, provider)).to eq(true) expect(redis.sismember("vmpooler__pending__#{pool}", vm)).to be(true) end end @@ -292,7 +292,7 @@ EOT it 'moves VM to completed queue if VM has exceeded timeout and exists' do redis_connection_pool.with do |redis| redis.hset("vmpooler__vm__#{vm}", 'clone',Date.new(2001,1,1).to_s) - expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, exists: true)).to eq(true) + expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, provider, exists: true)).to eq(true) expect(redis.sismember("vmpooler__pending__#{pool}", vm)).to be(false) expect(redis.sismember("vmpooler__completed__#{pool}", vm)).to be(true) end @@ -302,7 +302,7 @@ EOT redis_connection_pool.with do |redis| redis.hset("vmpooler__vm__#{vm}", 'clone',Date.new(2001,1,1).to_s) expect(logger).to receive(:log).with('d', "[!] [#{pool}] '#{vm}' marked as 'failed' after #{timeout} minutes with error: ") - expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, exists: true)).to eq(true) + expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, provider, exists: true)).to eq(true) end end @@ -311,14 +311,14 @@ EOT redis.hset("vmpooler__vm__#{vm}", 'clone',Date.new(2001,1,1).to_s) expect(logger).to_not receive(:log) expect(subject).to receive(:remove_nonexistent_vm).with(vm, pool, redis) - expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, exists: false)).to eq(true) + expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, provider, exists: false)).to eq(true) end end it 'swallows error if an error is raised' do redis_connection_pool.with do |redis| redis.hset("vmpooler__vm__#{vm}", 'clone','iamnotparsable_asdate') - expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, exists: true)).to eq(false) + expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, provider, exists: true)).to eq(false) end end @@ -327,7 +327,7 @@ EOT redis.hset("vmpooler__vm__#{vm}", 'clone','iamnotparsable_asdate') expect(logger).to receive(:log).with('d', String) - subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, exists: true) + subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, provider, exists: true) end end @@ -338,7 +338,7 @@ EOT redis.hset("vmpooler__vm__#{vm}", 'clone',(Time.now - 900).to_s) redis.hset("vmpooler__vm__#{vm}", 'pool_alias', pool) redis.hset("vmpooler__vm__#{vm}", 'request_id', request_id) - subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, exists: true) + subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, provider, exists: true) expect(redis.zrange('vmpooler__odcreate__task', 0, -1)).to eq(["#{pool}:#{pool}:1:#{request_id}"]) end end @@ -4140,7 +4140,7 @@ EOT it 'should call fail_pending_vm' do redis_connection_pool.with do |redis| - expect(subject).to receive(:fail_pending_vm).with(vm, pool, Integer, Integer, redis, exists: false) + expect(subject).to receive(:fail_pending_vm).with(vm, pool, Integer, Integer, redis, provider, exists: false) end subject.check_pending_pool_vms(pool, provider, pool_check_response, inventory, timeout, timeout_notification)