beaker 2.14.1 → 2.15.0

data/spec/beaker/dsl/install_utils/module_utils_spec.rb

@@ -136,7 +136,7 @@ describe ClassMixedWithDSLInstallUtils do
         allow( File ).to receive(:directory?).with(any_args()).and_return(false)
 
         expect( subject ).to receive(:scp_to).with(host,source, File.dirname(target), {:ignore => ignore_list})
-        expect( subject ).to receive(:on).with(host, "mv #{File.join(File.dirname(target), File.basename(source))} #{target}")
+        expect( host ).to receive(:mv).with(File.join(File.dirname(target), File.basename(source)), target)
         if opts.nil?
           subject.copy_module_to(host)
         else
@@ -187,7 +187,7 @@ describe ClassMixedWithDSLInstallUtils do
         expect( subject ).to receive(:on).with(host, "echo C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules" ).and_return( result )
 
         expect( subject ).to receive(:scp_to).with(host, "/opt/testmodule2", "C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules", {:ignore => ignore_list})
-        expect( subject ).to receive(:on).with(host, 'move /y C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules/testmodule2 C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules/testmodule')
+        expect( host ).to receive(:mv).with('C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules/testmodule2', 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules/testmodule')
 
         subject.copy_module_to(host, {:module_name => 'testmodule', :source => '/opt/testmodule2'})
       end

data/spec/beaker/dsl/install_utils/pe_utils_spec.rb

@@ -41,6 +41,55 @@ describe ClassMixedWithDSLInstallUtils do
                                                 :pe_ver => '3.0',
                                                 :working_dir => '/tmp',
                                                 :dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
+  context '#configure_pe_defaults_on' do
+    it 'uses aio paths for hosts of type aio' do
+      hosts.each do |host|
+        host[:type] = 'aio'
+      end
+      expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
+
+      subject.configure_pe_defaults_on( hosts )
+    end
+
+    it 'uses foss paths for hosts of type pe' do
+      hosts.each do |host|
+        host[:type] = 'pe'
+      end
+      expect(subject).to receive(:add_pe_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
+
+      subject.configure_pe_defaults_on( hosts )
+    end
+
+    it 'uses foss paths for hosts with no type and version < 4.0' do
+      expect(subject).to receive(:add_pe_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
+
+      subject.configure_pe_defaults_on( hosts )
+    end
+
+    it 'uses aio paths for hosts of version >= 4.0' do
+      hosts.each do |host|
+        host[:pe_ver] = '4.0'
+      end
+      expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
+
+      subject.configure_pe_defaults_on( hosts )
+    end
+
+    it 'uses foss paths for hosts of version < 4.0' do
+      hosts.each do |host|
+        host[:pe_ver] = '3.8'
+      end
+      expect(subject).to receive(:add_pe_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
+
+      subject.configure_pe_defaults_on( hosts )
+    end
+
+  end
 
   describe 'sorted_hosts' do
     it 'can reorder so that the master comes first' do
@@ -285,10 +334,12 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :sign_certificate_for ).and_return( true )
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
+      allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('3.0')
       allow( subject ).to receive( :version_is_less ).with('3.0', '4.0').and_return( true )
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.4').and_return( true )
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.0').and_return( false )
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.99').and_return( true )
+      allow( subject ).to receive( :version_is_less ).with('3.99', '3.0').and_return( false )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
@@ -350,7 +401,10 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :fetch_pe ).and_return( true )
       allow( subject ).to receive( :create_remote_file ).and_return( true )
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
+      allow( subject ).to receive( :max_version ).with(['3.0'], '3.8').and_return('3.0')
+      allow( subject ).to receive( :version_is_less ).with('3.99', '3.0').and_return( false )
       allow( subject ).to receive( :version_is_less ).with(anything, '3.2.0').exactly(hosts.length + 1).times.and_return( false )
+      allow( subject ).to receive( :version_is_less ).with(anything, '4.0').exactly(hosts.length + 1).times.and_return( true )
 
       expect( subject ).to receive( :on ).with( hosts[0], /puppet-enterprise-installer/ ).once
       expect( subject ).to receive( :create_remote_file ).with( hosts[0], /answers/, /q/ ).once
@@ -361,6 +415,58 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to_not receive( :on ).with( hosts[0], /puppet agent -t/, :acceptable_exit_codes => [0,2] )
       subject.do_install( hosts, opts)
     end
+
+    it 'can perform a 4+ installation using AIO agents' do
+      hosts = make_hosts({
+        :pe_ver => '4.0',
+        :roles => ['agent'],
+      }, 3)
+      hosts[0][:roles] = ['master', 'database', 'dashboard']
+      hosts[1][:platform] = 'windows'
+      hosts[2][:platform] = Beaker::Platform.new('el-6-x86_64')
+
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      allow( subject ).to receive( :options ).and_return(Beaker::Options::Presets.new.presets)
+      allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
+      allow( subject ).to receive( :fetch_pe ).and_return( true )
+      allow( subject ).to receive( :create_remote_file ).and_return( true )
+      allow( subject ).to receive( :sign_certificate_for ).and_return( true )
+      allow( subject ).to receive( :stop_agent_on ).and_return( true )
+      allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
+      allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
+      allow( subject ).to receive( :version_is_less ).with('4.0', '4.0').and_return( false )
+      allow( subject ).to receive( :version_is_less ).with('4.0', '3.4').and_return( false )
+      allow( subject ).to receive( :version_is_less ).with('4.0', '3.0').and_return( false )
+      allow( subject ).to receive( :version_is_less ).with('3.99', '4.0').and_return( true )
+      # pe_ver is only set on the hosts for this test, not the opt
+      allow( subject ).to receive( :version_is_less ).with('4.0', '3.99').and_return( true )
+      allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
+      allow( subject ).to receive( :puppet_agent ) do |arg|
+        "puppet agent #{arg}"
+      end
+      allow( subject ).to receive( :puppet ) do |arg|
+        "puppet #{arg}"
+      end
+
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      #create answers file per-host, except windows
+      expect( subject ).to receive( :create_remote_file ).with( hosts[0], /answers/, /q/ ).once
+      #run installer on all hosts
+      expect( subject ).to receive( :on ).with( hosts[0], /puppet-enterprise-installer/ ).once
+      expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[1], opts ).once
+      expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[2], opts ).once
+      hosts.each do |host|
+        expect( subject ).to receive( :add_aio_defaults_on ).with( host ).once
+        expect( subject ).to receive( :sign_certificate_for ).with( host ).once
+        expect( subject ).to receive( :stop_agent_on ).with( host ).once
+        expect( subject ).to receive( :on ).with( host, /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
+      end
+      #wait for puppetdb to start
+      expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).once#wait for all hosts to appear in the dashboard
+      #run puppet agent now that installation is complete
+      expect( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] ).once
+      subject.do_install( hosts, opts )
+    end
   end
 
   describe 'do_higgs_install' do

data/spec/beaker/dsl/install_utils/puppet_utils_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+class ClassMixedWithDSLInstallUtils
+  include Beaker::DSL::Wrappers
+  include Beaker::DSL::Helpers
+  include Beaker::DSL::Structure
+  include Beaker::DSL::Roles
+  include Beaker::DSL::Patterns
+  include Beaker::DSL::InstallUtils
+
+  def logger
+    @logger ||= RSpec::Mocks::Double.new('logger').as_null_object
+  end
+end
+
+describe ClassMixedWithDSLInstallUtils do
+  let(:metadata)      { @metadata ||= {} }
+  let(:presets)       { Beaker::Options::Presets.new }
+  let(:opts)          { presets.presets.merge(presets.env_vars) }
+  let(:basic_hosts)   { make_hosts( { :pe_ver => '3.0',
+                                       :platform => 'linux',
+                                       :roles => [ 'agent' ] }, 4 ) }
+  let(:hosts)         { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
+                        basic_hosts[1][:platform] = 'windows'
+                        basic_hosts[2][:platform] = 'osx-10.9-x86_64'
+                        basic_hosts[3][:platform] = 'eos'
+                        basic_hosts  }
+  let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3] ] }
+  let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp',
+                                                :is_cygwin => true} ) }
+  let(:winhost_non_cygwin) { make_host( 'winhost_non_cygwin', { :platform => 'windows',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp',
+                                                :is_cygwin => 'false' } ) }
+  let(:machost)       { make_host( 'machost', { :platform => 'osx-10.9-x86_64',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp' } ) }
+  let(:unixhost)      { make_host( 'unixhost', { :platform => 'linux',
+                                                 :pe_ver => '3.0',
+                                                 :working_dir => '/tmp',
+                                                 :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386' } ) }
+  let(:eoshost)       { make_host( 'eoshost', { :platform => 'eos',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp',
+                                                :dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
+
+  describe "#configure_defaults_on" do
+
+    it "can set foss defaults" do
+      expect(subject).to receive(:add_foss_defaults_on).exactly(hosts.length).times
+      subject.configure_defaults_on(hosts, 'foss')
+    end
+
+    it "can set aio defaults" do
+      expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
+      subject.configure_defaults_on(hosts, 'aio')
+    end
+
+    it "can set pe defaults" do
+      expect(subject).to receive(:add_pe_defaults_on).exactly(hosts.length).times
+      subject.configure_defaults_on(hosts, 'pe')
+    end
+
+    it 'can remove old defaults ands replace with new' do
+      expect(subject).to receive(:remove_pe_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_foss_defaults_on).exactly(hosts.length).times
+      subject.configure_defaults_on(hosts, 'pe')
+      subject.configure_defaults_on(hosts, 'foss')
+    end
+  end
+end

data/spec/beaker/dsl/structure_spec.rb

@@ -227,4 +227,71 @@ describe ClassMixedWithDSLStructure do
       expect( selected_hosts ).to be == [ host1 ]
     end
   end
+
+  describe '#tag' do
+    let ( :tag_includes ) { @tag_includes || [] }
+    let ( :tag_excludes ) { @tag_excludes || [] }
+    let ( :options )      {
+      opts = Beaker::Options::OptionsHash.new
+      opts[:tag_includes] = tag_includes
+      opts[:tag_excludes] = tag_excludes
+      opts
+    }
+
+    it 'sets tags on the TestCase\'s metadata object' do
+      subject.instance_variable_set(:@options, options)
+      tags = ['pants', 'jayjay', 'moguely']
+      subject.tag(*tags)
+      expect( metadata[:case][:tags] ).to be === tags
+    end
+
+    it 'lowercases the tags' do
+      subject.instance_variable_set(:@options, options)
+      tags_upper = ['pANTs', 'jAYJAy', 'moGUYly']
+      tags_lower = tags_upper.map(&:downcase)
+      subject.tag(*tags_upper)
+      expect( metadata[:case][:tags] ).to be === tags_lower
+    end
+
+    it 'skips the test if any of the requested tags isn\'t included in this test' do
+      test_tags = ['pants', 'jayjay', 'moguely']
+      @tag_includes = test_tags.compact.push('needed_tag_not_in_test')
+      subject.instance_variable_set(:@options, options)
+
+      allow( subject ).to receive( :path )
+      expect( subject ).to receive( :skip_test )
+      subject.tag(*test_tags)
+    end
+
+    it 'runs the test if all requested tags are included in this test' do
+      @tag_includes = ['pants_on_head', 'jayjay_jayjay', 'mo']
+      test_tags = @tag_includes.compact.push('extra_asdf')
+      subject.instance_variable_set(:@options, options)
+
+      allow( subject ).to receive( :path )
+      expect( subject ).to receive( :skip_test ).never
+      subject.tag(*test_tags)
+    end
+
+    it 'skips the test if any of the excluded tags are included in this test' do
+      test_tags = ['ports', 'jay_john_mary', 'mog_the_dog']
+      @tag_excludes = [test_tags[0]]
+      subject.instance_variable_set(:@options, options)
+
+      allow( subject ).to receive( :path )
+      expect( subject ).to receive( :skip_test )
+      subject.tag(*test_tags)
+    end
+
+    it 'runs the test if none of the excluded tags are included in this test' do
+      @tag_excludes = ['pants_on_head', 'jayjay_jayjay', 'mo']
+      test_tags     = ['pants_at_head', 'jayj00_jayjay', 'motly_crew']
+      subject.instance_variable_set(:@options, options)
+
+      allow( subject ).to receive( :path )
+      expect( subject ).to receive( :skip_test ).never
+      subject.tag(*test_tags)
+    end
+
+  end
 end

data/spec/beaker/host/unix/exec_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+module Beaker
+  describe Unix::Exec do
+    class UnixExecTest
+      include Unix::Exec
+
+      def initialize(hash, logger)
+        @hash = hash
+        @logger = logger
+      end
+
+      def [](k)
+        @hash[k]
+      end
+
+      def to_s
+        "me"
+      end
+
+    end
+
+    let (:opts)     { @opts || {} }
+    let (:logger)   { double( 'logger' ).as_null_object }
+    let (:instance) { UnixExecTest.new(opts, logger) }
+
+    context "rm" do
+
+      it "deletes" do
+        path = '/path/to/delete'
+        expect( instance ).to receive(:execute).with("rm -rf #{path}").and_return(0)
+        expect( instance.rm_rf(path) ).to be === 0
+      end
+    end
+
+    context 'mv' do
+      let(:origin)      { '/origin/path/of/content' }
+      let(:destination) { '/destination/path/of/content' }
+
+      it 'rm first' do
+        expect( instance ).to receive(:execute).with("rm -rf #{destination}").and_return(0)
+        expect( instance ).to receive(:execute).with("mv #{origin} #{destination}").and_return(0)
+        expect( instance.mv(origin, destination) ).to be === 0
+
+      end
+
+      it 'does not rm' do
+         expect( instance ).to receive(:execute).with("mv #{origin} #{destination}").and_return(0)
+         expect( instance.mv(origin, destination, false) ).to be === 0
+      end
+    end
+  end
+end

data/spec/beaker/host/windows/exec_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+module Beaker
+  describe PSWindows::Exec do
+    class PSWindowsExecTest
+      include PSWindows::Exec
+
+      def initialize(hash, logger)
+        @hash = hash
+        @logger = logger
+      end
+
+      def [](k)
+        @hash[k]
+      end
+
+      def to_s
+        "me"
+      end
+
+    end
+
+    let (:opts)     { @opts || {} }
+    let (:logger)   { double( 'logger' ).as_null_object }
+    let (:instance) { PSWindowsExecTest.new(opts, logger) }
+
+    context "rm" do
+
+      it "deletes" do
+        path = '/path/to/delete'
+        expect( instance ).to receive(:execute).with("del /s /q #{path}").and_return(0)
+        expect( instance.rm_rf(path) ).to be === 0
+      end
+    end
+
+    context 'mv' do
+      let(:origin)      { '/origin/path/of/content' }
+      let(:destination) { '/destination/path/of/content' }
+
+      it 'rm first' do
+        expect( instance ).to receive(:execute).with("del /s /q #{destination}").and_return(0)
+        expect( instance ).to receive(:execute).with("move /y #{origin} #{destination}").and_return(0)
+        expect( instance.mv(origin, destination) ).to be === 0
+
+      end
+
+      it 'does not rm' do
+         expect( instance ).to receive(:execute).with("move /y #{origin} #{destination}").and_return(0)
+         expect( instance.mv(origin, destination, false) ).to be === 0
+      end
+    end
+  end
+end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -46,6 +46,11 @@ describe Beaker do
     "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""
   ], true
 
+  # FreeBSD
+  it_should_behave_like 'enables_root_login', 'freesbd', [
+    "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""
+  ], true
+
   it_should_behave_like 'enables_root_login', 'osx', [
     "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config",
     "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /etc/sshd_config"
@@ -540,6 +545,14 @@ describe Beaker do
       set_env_helper('aix', commands)
     end
 
+    it "can set the environment on a FreeBSD host" do
+      commands = [
+        "sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config",
+        "sudo /etc/rc.d/sshd restart",
+      ]
+      set_env_helper('freebsd', commands)
+    end
+
     def set_env_helper(platform_name, host_specific_commands_array)
       host = make_host('name', {
           :platform     => platform_name,

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -92,5 +92,70 @@ module Beaker
         expect { aws.group_id([]) }.to raise_error(ArgumentError, "Ports list cannot be nil or empty")
       end
     end
+
+    describe '#populate_dns' do
+      let( :vpc_instance ) { {ip_address: nil, private_ip_address: "vpc_private_ip", dns_name: "vpc_dns_name"} }
+      let( :ec2_instance ) { {ip_address: "ec2_public_ip", private_ip_address: "ec2_private_ip", dns_name: "ec2_dns_name"} }
+
+      context 'on a public EC2 instance' do
+        before :each do
+          @hosts.each {|host| host['instance'] = make_instance ec2_instance}
+        end
+
+        it 'sets host ip to instance.ip_address' do
+          aws.populate_dns();
+          hosts =  aws.instance_variable_get( :@hosts )
+          hosts.each do |host|
+            expect(host['ip']).to eql(ec2_instance[:ip_address])
+          end
+        end
+
+        it 'sets host private_ip to instance.private_ip_address' do
+          aws.populate_dns();
+          hosts =  aws.instance_variable_get( :@hosts )
+          hosts.each do |host|
+            expect(host['private_ip']).to eql(ec2_instance[:private_ip_address])
+          end
+        end
+
+        it 'sets host dns_name to instance.dns_name' do
+          aws.populate_dns();
+          hosts =  aws.instance_variable_get( :@hosts )
+          hosts.each do |host|
+            expect(host['dns_name']).to eql(ec2_instance[:dns_name])
+          end
+        end
+      end
+
+      context 'on a VPC based instance' do
+        before :each do
+          @hosts.each {|host| host['instance'] = make_instance vpc_instance}
+        end
+
+        it 'sets host ip to instance.private_ip_address' do
+          aws.populate_dns();
+          hosts =  aws.instance_variable_get( :@hosts )
+          hosts.each do |host|
+            expect(host['ip']).to eql(vpc_instance[:private_ip_address])
+          end
+        end
+
+        it 'sets host private_ip to instance.private_ip_address' do
+          aws.populate_dns();
+          hosts =  aws.instance_variable_get( :@hosts )
+          hosts.each do |host|
+            expect(host['private_ip']).to eql(vpc_instance[:private_ip_address])
+          end
+        end
+
+        it 'sets host dns_name to instance.dns_name' do
+          aws.populate_dns();
+          hosts =  aws.instance_variable_get( :@hosts )
+          hosts.each do |host|
+            expect(host['dns_name']).to eql(vpc_instance[:dns_name])
+          end
+        end
+      end
+    end
   end
 end