beaker 2.24.0 → 2.25.0

data/spec/beaker/dsl/structure_spec.rb

@@ -28,8 +28,10 @@ describe ClassMixedWithDSLStructure do
     end
 
     it 'yields if a block is given' do
-      expect( subject ).to receive( :logger ).and_return( logger )
+      expect( subject ).to receive( :logger ).and_return( logger ).exactly(3).times
       allow(  subject ).to receive( :set_current_step_name )
+      expect( logger ).to receive( :step_in )
+      expect( logger ).to receive( :step_out )
       expect( logger ).to receive( :notify )
       expect( subject ).to receive( :foo )
       subject.step 'blah' do
@@ -59,8 +61,10 @@ describe ClassMixedWithDSLStructure do
     end
 
     it 'yields if a block is given' do
-      expect( subject ).to receive( :logger ).and_return( logger )
+      expect( subject ).to receive( :logger ).and_return( logger ).exactly(3).times
       expect( logger ).to receive( :notify )
+      expect( logger ).to receive( :step_in )
+      expect( logger ).to receive( :step_out )
       expect( subject ).to receive( :foo )
       subject.test_name 'blah' do
         subject.foo
@@ -131,6 +135,7 @@ describe ClassMixedWithDSLStructure do
     it ':to - uses a provided host subset when no criteria is provided' do
       subset = ['host1', 'host2']
       hosts = subset.dup << 'host3'
+      allow( subject ).to receive( :hosts ).and_return(hosts).twice
       expect( subject ).to receive( :hosts= ).with( subset )
       subject.confine :to, {}, subset
     end
@@ -138,13 +143,14 @@ describe ClassMixedWithDSLStructure do
     it ':except - excludes provided host subset when no criteria is provided' do
       subset = ['host1', 'host2']
       hosts = subset.dup << 'host3'
-      allow( subject ).to receive( :hosts ).and_return(hosts)
+      allow( subject ).to receive( :hosts ).and_return(hosts).twice
       expect( subject ).to receive( :hosts= ).with( hosts - subset )
       subject.confine :except, {}, subset
     end
 
     it 'raises when given mode is not :to or :except' do
-      allow( subject ).to receive( :hosts )
+      hosts = ['host1', 'host2']
+      allow( subject ).to receive( :hosts ).and_return(hosts)
       allow( subject ).to receive( :hosts= )
 
       expect {
@@ -155,7 +161,7 @@ describe ClassMixedWithDSLStructure do
     it 'rejects hosts that do not meet simple hash criteria' do
       hosts = [ {'thing' => 'foo'}, {'thing' => 'bar'} ]
 
-      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :hosts ).and_return( hosts ).twice
       expect( subject ).to receive( :hosts= ).
         with( [ {'thing' => 'foo'} ] )
 
@@ -165,7 +171,7 @@ describe ClassMixedWithDSLStructure do
     it 'rejects hosts that match a list of criteria' do
       hosts = [ {'thing' => 'foo'}, {'thing' => 'bar'}, {'thing' => 'baz'} ]
 
-      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :hosts ).and_return( hosts ).twice
       expect( subject ).to receive( :hosts= ).
         with( [ {'thing' => 'bar'} ] )
 
@@ -180,7 +186,7 @@ describe ClassMixedWithDSLStructure do
       ret2 = (Struct.new('Result2', :stdout)).new('a_zone')
       hosts = [ host1, host2, host3 ]
 
-      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :hosts ).and_return( hosts ).twice
       expect( subject ).to receive( :on ).
         with( host1, '/sbin/zonename' ).
         and_return( ret1 )
@@ -194,6 +200,37 @@ describe ClassMixedWithDSLStructure do
         subject.on( host, '/sbin/zonename' ).stdout =~ /:global/
       end
     end
+
+    it 'doesn\'t corrupt the global hosts hash when confining from a subset of hosts' do
+      host1 = {'platform' => 'solaris', :roles => ['master']}
+      host2 = {'platform' => 'solaris', :roles => ['agent']}
+      host3 = {'platform' => 'windows', :roles => ['agent']}
+      hosts = [ host1, host2, host3 ]
+      agents = [ host2, host3 ]
+
+      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :hosts= ).with( [  host2, host1 ] )
+      confined_hosts = subject.confine :except, {:platform => 'windows'}, agents
+      expect( confined_hosts ).to be === [ host2, host1 ]
+    end
+
+    it 'can apply multiple confines correctly' do
+      host1 = {'platform' => 'solaris', :roles => ['master']}
+      host2 = {'platform' => 'solaris', :roles => ['agent']}
+      host3 = {'platform' => 'windows', :roles => ['agent']}
+      host4 = {'platform' => 'fedora', :roles => ['agent']}
+      host5 = {'platform' => 'fedora', :roles => ['agent']}
+      hosts = [ host1, host2, host3, host4, host5 ]
+      agents = [ host2, host3, host4, host5 ]
+
+      expect( subject ).to receive( :hosts ).and_return( hosts ).exactly(3).times
+      expect( subject ).to receive( :hosts= ).with( [  host1, host2, host4, host5 ] )
+      hosts = subject.confine :except, {:platform => 'windows'}
+      expect( hosts ).to be === [ host1, host2, host4, host5  ]
+      expect( subject ).to receive( :hosts= ).with( [  host4, host5, host1 ] )
+      hosts = subject.confine :to, {:platform => 'fedora'}, agents
+      expect( hosts ).to be === [ host4, host5, host1 ]
+    end
   end
 
   describe '#select_hosts' do

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -154,6 +154,12 @@ describe Beaker do
   context "epel_info_for!" do
     subject { dummy_class.new }
 
+    it "can return the correct url for an el-7 host" do
+      host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-7-platform') } )
+
+      expect( subject.epel_info_for( host, options )).to be === ["http://mirrors.kernel.org/fedora-epel/7", "x86_64", "epel-release-7-5.noarch.rpm"]
+    end
+
     it "can return the correct url for an el-6 host" do
       host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-6-platform') } )
 
@@ -170,7 +176,7 @@ describe Beaker do
     it "raises an error on non el-5/6 host" do
       host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-4-platform') } )
 
-      expect{ subject.epel_info_for( host, options )}.to raise_error(RuntimeError, /epel_info_for does not support el version/)
+      expect{ subject.epel_info_for( host, options )}.to raise_error(ArgumentError, /epel_info_for does not support el version/)
 
     end
 

data/spec/beaker/host_spec.rb

@@ -240,6 +240,8 @@ module Beaker
         logger = double(:logger)
         allow( logger ).to receive(:host_output)
         allow( logger ).to receive(:debug)
+        allow( logger ).to receive(:step_in)
+        allow( logger ).to receive(:step_out)
         host.instance_variable_set :@logger, logger
         conn = double(:connection)
         allow( conn ).to receive(:execute).and_return(result)

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Beaker
   describe AwsSdk do
-    let( :options ) { make_opts.merge({ 'logger' => double().as_null_object }) }
+    let( :options ) { make_opts.merge({ 'logger' => double().as_null_object, 'timestamp' => Time.now }) }
     let(:aws) {
       # Mock out the call to load_fog_credentials
       allow_any_instance_of( Beaker::AwsSdk ).
@@ -211,6 +211,7 @@ module Beaker
       context 'with a list of hosts' do
         before :each do
           @hosts.each {|host| host['instance'] = ec2_instance}
+          expect(aws).to receive( :delete_key_pair_all_regions )
         end
 
         it { is_expected.to be_nil }
@@ -224,6 +225,7 @@ module Beaker
       context 'with an empty host list' do
         before :each do
           @hosts = []
+          expect(aws).to receive( :delete_key_pair_all_regions )
         end
 
         it { is_expected.to be_nil }
@@ -268,7 +270,16 @@ module Beaker
       it { is_expected.to be_instance_of(AWS::EC2::SecurityGroupCollection) }
     end
 
-    describe '#kill_zombies', :wip do
+    describe '#kill_zombies' do
+      it 'calls delete_key_pair_all_regions' do
+        ec2_mock = Object.new
+        allow(ec2_mock).to receive( :regions ).and_return( {} )
+        aws.instance_variable_set( :@ec2, ec2_mock )
+
+        expect( aws ).to receive( :delete_key_pair_all_regions ).once
+
+        aws.kill_zombies()
+      end
     end
 
     describe '#kill_zombie_volumes', :wip do
@@ -634,8 +645,11 @@ module Beaker
         expect( Socket ).to receive(:gethostname) { "foobar" }
         expect( aws ).to receive(:local_user) { "bob" }
 
+        options[:timestamp] = Time.now
+        date_part = options[:timestamp].strftime("%F_%H_%M_%S")
+
         # Should match the expected composite key name
-        expect(aws.key_name).to eq("Beaker-bob-foobar")
+        expect(aws.key_name).to eq("Beaker-bob-foobar-#{date_part}")
       end
     end
 
@@ -647,19 +661,37 @@ module Beaker
     end
 
     describe '#ensure_key_pair' do
-      let( :region ) { double('region') }
+      let( :region ) { double('region', :name => 'test_region_name') }
       subject(:ensure_key_pair) { aws.ensure_key_pair(region) }
 
       context 'when a beaker keypair already exists' do
         it 'returns the keypair if available' do
           stub_const('ENV', ENV.to_hash.merge('USER' => 'rspec'))
-          key_pair = double(:exists? => true, :secret => 'supersekritkey')
+          key_pair = double(:exists? => true, :secret => 'supersekritkey', :delete => true)
+          allow( aws ).to receive( :key_name ).and_return( "Beaker-rspec-SUT" )
           key_pairs = { "Beaker-rspec-SUT" => key_pair }
 
-          expect( region ).to receive(:key_pairs).and_return(key_pairs).once
-          expect( Socket ).to receive(:gethostname).and_return("SUT")
+          expect( region ).to receive(:key_pairs).and_return(key_pairs).twice
+          expect( aws ).to receive( :public_key ).and_return('test_ssh_string')
+          expect( key_pairs ).to receive( :import ).and_return(key_pair)
           expect(ensure_key_pair).to eq(key_pair)
         end
+
+        it 'generates a new keypair if :generate_new_keypair set' do
+          stub_const('ENV', ENV.to_hash.merge('USER' => 'rspec'))
+          key_pair = double(:exists? => true, :secret => 'keyOfSekritz', :delete => true)
+          allow( aws ).to receive( :key_name ).and_return( "Beaker-rspec-SUT" )
+          key_pairs = { "Beaker-rspec-SUT" => key_pair }
+          options[:keypair_generate_new] = true
+
+          answer = 'You get a keypair!  You get a keypair!  And you get a keypair too!'
+          expect( region ).to receive(:key_pairs).and_return(key_pairs).twice
+          expect( aws ).to receive( :public_key ).and_return('test_ssh_string')
+          expect( key_pairs ).to receive( :import ).and_return(answer)
+          returned_keypair = ensure_key_pair
+          expect(returned_keypair).not_to eq(key_pair)
+          expect(returned_keypair).to eq(answer)
+        end
       end
 
       context 'when a pre-existing keypair cannot be found' do
@@ -670,8 +702,8 @@ module Beaker
 
         before :each do
           stub_const('ENV', ENV.to_hash.merge('USER' => 'rspec'))
-          expect( region ).to receive(:key_pairs).and_return(key_pairs).once
-          expect( Socket ).to receive(:gethostname).and_return("SUT")
+          expect( region ).to receive(:key_pairs).and_return(key_pairs).twice
+          allow( aws ).to receive( :key_name ).and_return(key_name)
         end
 
         it 'imports a new key based on user pubkey' do
@@ -688,6 +720,114 @@ module Beaker
       end
     end
 
+    describe '#delete_key_pair_all_regions' do
+      it 'calls delete_key_pair over all regions' do
+        key_name = 'kname_test1538'
+        allow(aws).to receive( :key_name ).and_return(key_name)
+        regions = []
+        regions << double('region', :key_pairs => 'pair1', :name => 'name1')
+        regions << double('region', :key_pairs => 'pair2', :name => 'name2')
+        ec2_mock = Object.new
+        allow(ec2_mock).to receive( :regions ).and_return(regions)
+        aws.instance_variable_set( :@ec2, ec2_mock )
+        region_keypairs_hash_mock = {}
+        region_keypairs_hash_mock[double('region')] = ['key1', 'key2', 'key3']
+        region_keypairs_hash_mock[double('region')] = ['key4', 'key5', 'key6']
+        allow( aws ).to receive( :my_key_pairs ).and_return( region_keypairs_hash_mock )
+
+        region_keypairs_hash_mock.each_pair do |region, keyname_array|
+          keyname_array.each do |keyname|
+            expect( aws ).to receive( :delete_key_pair ).with( region, keyname )
+          end
+        end
+        aws.delete_key_pair_all_regions
+      end
+    end
+
+    describe '#my_key_pairs' do
+      let( :region ) { double('region', :name => 'test_region_name') }
+
+      it 'uses the default keyname if no filter is given' do
+        default_keyname_answer = 'test_pair_6193'
+        allow( aws ).to receive( :key_name ).and_return( default_keyname_answer )
+
+        kp_mock_1 = double('keypair')
+        kp_mock_2 = double('keypair')
+        regions = []
+        regions << double('region', :key_pairs => kp_mock_1, :name => 'name1')
+        regions << double('region', :key_pairs => kp_mock_2, :name => 'name2')
+        ec2_mock = Object.new
+        allow( ec2_mock ).to receive( :regions ).and_return( regions )
+        aws.instance_variable_set( :@ec2, ec2_mock )
+
+        kp_mock = double('keypair')
+        allow( region ).to receive( :key_pairs ).and_return( kp_mock )
+        expect( kp_mock_1 ).to receive( :filter ).with( 'key-name', default_keyname_answer ).and_return( [] )
+        expect( kp_mock_2 ).to receive( :filter ).with( 'key-name', default_keyname_answer ).and_return( [] )
+
+        aws.my_key_pairs()
+      end
+
+      it 'uses the filter passed if given' do
+        default_keyname_answer = 'test_pair_6194'
+        allow( aws ).to receive( :key_name ).and_return( default_keyname_answer )
+        name_filter = 'filter_pair_1597'
+        filter_star = "#{name_filter}-*"
+
+        kp_mock_1 = double('keypair')
+        kp_mock_2 = double('keypair')
+        regions = []
+        regions << double('region', :key_pairs => kp_mock_1, :name => 'name1')
+        regions << double('region', :key_pairs => kp_mock_2, :name => 'name2')
+        ec2_mock = Object.new
+        allow( ec2_mock ).to receive( :regions ).and_return( regions )
+        aws.instance_variable_set( :@ec2, ec2_mock )
+
+        kp_mock = double('keypair')
+        allow( region ).to receive( :key_pairs ).and_return( kp_mock )
+        expect( kp_mock_1 ).to receive( :filter ).with( 'key-name', filter_star ).and_return( [] )
+        expect( kp_mock_2 ).to receive( :filter ).with( 'key-name', filter_star ).and_return( [] )
+
+        aws.my_key_pairs(name_filter)
+      end
+    end
+
+    describe '#delete_key_pair' do
+      let( :region ) { double('region', :name => 'test_region_name') }
+
+      it 'calls delete on a keypair if it exists' do
+        pair_name = 'pair1'
+        kp_mock = double('keypair', :exists? => true)
+        expect( kp_mock ).to receive( :delete ).once
+        pairs = { pair_name => kp_mock }
+        allow( region ).to receive( :key_pairs ).and_return( pairs )
+        aws.delete_key_pair(region, pair_name)
+      end
+
+      it 'skips delete on a keypair if it does not exist' do
+        pair_name = 'pair1'
+        kp_mock = double('keypair', :exists? => false)
+        expect( kp_mock ).to receive( :delete ).never
+        pairs = { pair_name => kp_mock }
+        allow( region ).to receive( :key_pairs ).and_return( pairs )
+        aws.delete_key_pair(region, pair_name)
+      end
+    end
+
+    describe '#create_new_key_pair' do
+      let( :region ) { double('region', :name => 'test_region_name') }
+
+      it 'imports the key given from public_key' do
+        ssh_string = 'ssh_string_test_0867'
+        allow( aws ).to receive( :public_key ).and_return( ssh_string )
+        pairs = double('keypairs')
+        pair_name = 'pair_name_1555432'
+        expect( pairs ).to receive( :import ).with( pair_name, ssh_string )
+        expect( region ).to receive(:key_pairs).and_return(pairs).once
+        aws.create_new_key_pair( region, pair_name )
+      end
+    end
+
     describe '#group_id' do
       it 'should return a predicatable group_id from a port list' do
         expect(aws.group_id([22, 1024])).to eq("Beaker-2799478787")

data/spec/beaker/logger_spec.rb

@@ -45,6 +45,76 @@ module Beaker
 
     end
 
+    context '#prefix_log_line' do
+      def prefix_log_line_test_compare_helper(in_test, out_answer, step_in_loop=1)
+        logger.instance_variable_set( :@line_prefix_length, 0 )
+        step_in_loop.times { logger.step_in() }
+        expect( logger.prefix_log_line(in_test) ).to be === out_answer
+        logger.instance_variable_set( :@line_prefix_length, 0 )
+      end
+
+      it 'can be successfully called with a arrays' do
+        line_arg = ['who done that', 'who wears da pants']
+        answer_list = line_arg.map { |item| "  " + item }
+        prefix_log_line_test_compare_helper(line_arg, answer_list)
+      end
+
+      it 'removes carriage returns' do
+        line_arg = "  \r\n god doing this sucked"
+        answer = "    \n   god doing this sucked"
+        prefix_log_line_test_compare_helper(line_arg, answer)
+      end
+
+      it 'includes a newline at the end if it was on the input' do
+        line_arg = "why should this matter\n"
+        answer = "  why should this matter\n"
+        prefix_log_line_test_compare_helper(line_arg, answer)
+      end
+
+      it 'prepends multiple lines in one string' do
+        line_arg = "\n\nwhy should this matter\n"
+        answer = "  \n  \n  why should this matter\n"
+        prefix_log_line_test_compare_helper(line_arg, answer)
+      end
+
+      it 'can be nested' do
+        line_arg = "\n\nwhy should this matter"
+        answer = "      \n      \n      why should this matter"
+        prefix_log_line_test_compare_helper(line_arg, answer, 3)
+      end
+    end
+
+    context '#step_* methods' do
+      it 'steps in correctly (simple case)' do
+        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.step_in()
+        expect( logger.instance_variable_get( :@line_prefix_length ) ).to be === 2
+        expect( logger.line_prefix ).to be === '  '
+        logger.instance_variable_set( :@line_prefix_length, 0 )
+      end
+
+      it 'sets length correctly in mixed scenario ' do
+        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.step_in()
+        logger.step_in()
+        logger.step_out()
+        logger.step_in()
+        logger.step_in()
+        logger.step_out()
+        expect( logger.instance_variable_get( :@line_prefix_length ) ).to be === 4
+        expect( logger.line_prefix ).to be === '    '
+        logger.instance_variable_set( :@line_prefix_length, 0 )
+      end
+
+      it 'can be unevenly stepped out, will remain at base: 0' do
+        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.step_in()
+        10.times { logger.step_out() }
+        expect( logger.instance_variable_get( :@line_prefix_length ) ).to be === 0
+        expect( logger.line_prefix ).to be === ''
+      end
+    end
+
     context 'new' do
       it 'does not duplicate STDOUT when directly passed to it' do
         stdout_logger = Logger.new STDOUT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.25.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -276,6 +276,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: beaker-hiera
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +360,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-google
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +488,6 @@ files:
 - lib/beaker/dsl/assertions.rb
 - lib/beaker/dsl/helpers.rb
 - lib/beaker/dsl/helpers/facter_helpers.rb
-- lib/beaker/dsl/helpers/hiera_helpers.rb
 - lib/beaker/dsl/helpers/host_helpers.rb
 - lib/beaker/dsl/helpers/puppet_helpers.rb
 - lib/beaker/dsl/helpers/test_helpers.rb
@@ -567,7 +594,6 @@ files:
 - spec/beaker/dsl/assertions_spec.rb
 - spec/beaker/dsl/ezbake_utils_spec.rb
 - spec/beaker/dsl/helpers/facter_helpers_spec.rb
-- spec/beaker/dsl/helpers/hiera_helpers_spec.rb
 - spec/beaker/dsl/helpers/host_helpers_spec.rb
 - spec/beaker/dsl/helpers/puppet_helpers_spec.rb
 - spec/beaker/dsl/helpers/test_helpers_spec.rb