From 2fcd639882c1082794b61caf16a7d41a16c3d4b6 Mon Sep 17 00:00:00 2001 From: Rick Bradley Date: Wed, 1 Jun 2016 14:55:10 -0500 Subject: [PATCH] (maint) drop unneeded clear_pool helper Given the way we're flushing redis (which seems super performant), we don't need to clear pools any more at the beginning of tests. --- spec/helpers.rb | 6 ------ spec/vmpooler/api/v1/vm_spec.rb | 8 -------- 2 files changed, 14 deletions(-) diff --git a/spec/helpers.rb b/spec/helpers.rb index 924d8df..8b9ca76 100644 --- a/spec/helpers.rb +++ b/spec/helpers.rb @@ -39,9 +39,3 @@ end def fetch_vm(vm) redis.hgetall("vmpooler__vm__#{vm}") end - -def clear_pool(pool) - ['ready'].each do |state| # TODO add more states if desired - redis.del("vmpooler__#{state}__#{pool}") - end -end diff --git a/spec/vmpooler/api/v1/vm_spec.rb b/spec/vmpooler/api/v1/vm_spec.rb index fe5e544..6a4a068 100644 --- a/spec/vmpooler/api/v1/vm_spec.rb +++ b/spec/vmpooler/api/v1/vm_spec.rb @@ -48,7 +48,6 @@ describe Vmpooler::API::V1 do describe 'POST /vm' do it 'returns a single VM' do - clear_pool 'pool1' create_ready_vm 'pool1', 'abcdefghijklmnop' post "#{prefix}/vm", '{"pool1":"1"}' @@ -65,7 +64,6 @@ describe Vmpooler::API::V1 do end it 'returns a single VM for an alias' do - clear_pool 'pool1' create_ready_vm 'pool1', 'abcdefghijklmnop' post "#{prefix}/vm", '{"poolone":"1"}' @@ -82,14 +80,11 @@ describe Vmpooler::API::V1 do end it 'fails on nonexistant pools' do - clear_pool 'poolpoolpool' - post "#{prefix}/vm", '{"poolpoolpool":"1"}' expect_json(ok = false, http = 404) end it 'returns multiple VMs' do - clear_pool 'pool1' create_ready_vm 'pool1', 'abcdefghijklmnop' create_ready_vm 'pool2', 'qrstuvwxyz012345' @@ -113,7 +108,6 @@ describe Vmpooler::API::V1 do it 'does not extend VM lifetime if auth token is provided' do app.settings.set :config, auth: false - clear_pool 'pool1' create_ready_vm 'pool1', 'abcdefghijklmnop' post "#{prefix}/vm", '{"pool1":"1"}', { @@ -138,7 +132,6 @@ describe Vmpooler::API::V1 do it 'extends VM lifetime if auth token is provided' do app.settings.set :config, auth: true - clear_pool 'pool1' create_ready_vm 'pool1', 'abcdefghijklmnop' post "#{prefix}/vm", '{"pool1":"1"}', { @@ -160,7 +153,6 @@ describe Vmpooler::API::V1 do it 'does not extend VM lifetime if auth token is not provided' do app.settings.set :config, auth: true - clear_pool 'pool1' create_ready_vm 'pool1', 'abcdefghijklmnop' post "#{prefix}/vm", '{"pool1":"1"}'