mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 01:58:41 -05:00
remove references to provider
This commit is contained in:
parent
3ac0a25557
commit
45461bdd44
1 changed files with 8 additions and 8 deletions
|
|
@ -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, provider)).to eq(true)
|
||||
expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, nil)).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, provider)).to eq(true)
|
||||
expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, nil)).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, provider, exists: true)).to eq(true)
|
||||
expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, nil, 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, provider, exists: true)).to eq(true)
|
||||
expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, nil, 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, provider, exists: false)).to eq(true)
|
||||
expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, nil, 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, provider, exists: true)).to eq(false)
|
||||
expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, nil, 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, provider, exists: true)
|
||||
subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, nil, 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, provider, exists: true)
|
||||
subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, nil, exists: true)
|
||||
expect(redis.zrange('vmpooler__odcreate__task', 0, -1)).to eq(["#{pool}:#{pool}:1:#{request_id}"])
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue