beaker 1.12.2 → 1.13.0

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.12.2'
+    STRING = '1.13.0'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -210,6 +210,74 @@ describe ClassMixedWithDSLHelpers do
     end
   end
 
+  describe '#create_tmpdir_for_user' do
+    let(:host) { double.as_null_object }
+    let(:result) { double.as_null_object }
+
+    before :each do
+      allow(host).to receive(:result).and_return(result)
+      allow(result).to receive(:exit_code).and_return(0)
+      allow(result).to receive(:stdout).and_return('puppet')
+    end
+
+    context 'with no user argument' do
+
+      context 'with no path name argument' do
+        context 'without puppet installed on host' do
+          it 'raises an error' do
+            allow(host).to receive(:tmpdir).and_return("tmpdirname")
+            allow(result).to receive(:exit_code).and_return(1)
+            expect(subject).to receive(:on).with(host, /^puppet.*/).and_return(result)
+            expect{
+              subject.create_tmpdir_for_user host
+            }.to raise_error(RuntimeError, /`puppet master --configprint` failed,/)
+          end
+        end
+        context 'with puppet installed on host' do
+          it 'executes chown once' do
+            expect(subject).to receive(:on).with(host, /^puppet.*/).and_return(result)
+            expect(subject).to receive(:on).with(host, /^getent passwd puppet/).and_return(result)
+            expect(host).to receive(:tmpdir).with(/\/tmp\/beaker.*/)
+            expect(subject).to receive(:on).with(host, /chown puppet.puppet.*/)
+            subject.create_tmpdir_for_user(host)
+          end
+        end
+      end
+
+      context 'with path name argument' do
+        it 'executes chown once' do
+          expect(subject).to receive(:on).with(host, /^puppet.*/).and_return(result)
+          expect(subject).to receive(:on).with(host, /^getent passwd puppet/).and_return(result)
+          expect(host).to receive(:tmpdir).with(/\/tmp\/bogus.*/).and_return("/tmp/bogus")
+          expect(subject).to receive(:on).with(host, /chown puppet.puppet \/tmp\/bogus.*/)
+          subject.create_tmpdir_for_user(host, "/tmp/bogus")
+        end
+      end
+
+    end
+
+    context 'with an invalid user argument' do
+      it 'executes chown once' do
+        allow(result).to receive(:stdout).and_return('curiousgeorge')
+        expect(subject).to receive(:on).with(host, /^getent passwd curiousgeorge/).and_return(result)
+        expect(host).to receive(:tmpdir).with(/\/tmp\/bogus.*/).and_return("/tmp/bogus")
+        expect(subject).to receive(:on).with(host, /chown curiousgeorge.curiousgeorge \/tmp\/bogus.*/)
+        subject.create_tmpdir_for_user(host, "/tmp/bogus", "curiousgeorge")
+      end
+    end
+
+    context 'with a valid user argument' do
+      it 'executes chown once' do
+        allow(result).to receive(:exit_code).and_return(1)
+        expect(subject).to receive(:on).with(host, /^getent passwd curiousgeorge/).and_return(result)
+        expect{
+          subject.create_tmpdir_for_user(host, "/tmp/bogus", "curiousgeorge")
+        }.to raise_error(RuntimeError, /User curiousgeorge does not exist on/)
+      end
+    end
+
+  end
+
   describe '#run_script_on' do
     it 'scps the script to a tmpdir and executes it on host(s)' do
       subject.should_receive( :scp_to )
@@ -320,7 +388,7 @@ describe ClassMixedWithDSLHelpers do
     it 'calls puppet' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', 'agent' ).
+      #  with( 'apply', '--verbose', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).
@@ -336,22 +404,19 @@ describe ClassMixedWithDSLHelpers do
       subject.should_receive( :create_remote_file ).twice.and_return( true )
       the_hosts.each do |host|
         subject.should_receive( :puppet ).
-          with( 'apply', '--verbose', host.to_s ).
           and_return( 'puppet_command' )
 
         subject.should_receive( :on ).
-          with( host, 'puppet_command',
-                :acceptable_exit_codes => [0, 1] ).ordered
+          with( host, 'puppet_command', :acceptable_exit_codes => [0] )
       end
 
-      result = subject.apply_manifest_on( the_hosts, 'include foobar', :acceptable_exit_codes => [0,1] )
+      result = subject.apply_manifest_on( the_hosts, 'include foobar' )
       result.should(be_an(Array))
     end
 
     it 'adds acceptable exit codes with :catch_failures' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).
@@ -360,13 +425,11 @@ describe ClassMixedWithDSLHelpers do
 
       subject.apply_manifest_on( agent,
                                 'class { "boo": }',
-                                :trace => true,
                                 :catch_failures => true )
     end
     it 'allows acceptable exit codes through :catch_failures' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).
@@ -376,13 +439,11 @@ describe ClassMixedWithDSLHelpers do
       subject.apply_manifest_on( agent,
                                 'class { "boo": }',
                                 :acceptable_exit_codes => [4],
-                                :trace => true,
                                 :catch_failures => true )
     end
     it 'enforces a 0 exit code through :catch_changes' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
@@ -394,14 +455,12 @@ describe ClassMixedWithDSLHelpers do
       subject.apply_manifest_on(
         agent,
         'class { "boo": }',
-        :trace         => true,
         :catch_changes => true
       )
     end
     it 'enforces a 2 exit code through :expect_changes' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
@@ -413,14 +472,12 @@ describe ClassMixedWithDSLHelpers do
       subject.apply_manifest_on(
         agent,
         'class { "boo": }',
-        :trace         => true,
         :expect_changes => true
       )
     end
     it 'enforces exit codes through :expect_failures' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
@@ -432,7 +489,6 @@ describe ClassMixedWithDSLHelpers do
       subject.apply_manifest_on(
         agent,
         'class { "boo": }',
-        :trace           => true,
         :expect_failures => true
       )
     end
@@ -441,7 +497,6 @@ describe ClassMixedWithDSLHelpers do
         subject.apply_manifest_on(
           agent,
           'class { "boo": }',
-          :trace           => true,
           :expect_failures => true,
           :catch_failures  => true
         )
@@ -450,7 +505,6 @@ describe ClassMixedWithDSLHelpers do
     it 'enforces added exit codes through :expect_failures' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
@@ -463,27 +517,46 @@ describe ClassMixedWithDSLHelpers do
         agent,
         'class { "boo": }',
         :acceptable_exit_codes => (1..5),
-        :trace                 => true,
         :expect_failures       => true
       )
     end
 
     it 'can set the --parser future flag' do
       subject.should_receive( :create_remote_file ).and_return( true )
-      subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--parser future', '--detailed-exitcodes', 'agent' ).
-        and_return( 'puppet_command' )
-      subject.should_receive( :on ).with(
+
+      expect( subject ).to receive( :on ).with {|h, command, opts|
+        cmdline = command.cmd_line( h )
+        expect( h ).to be == agent
+        expect( cmdline ).to include('puppet apply')
+        expect( cmdline ).to include('--parser=future')
+        expect( cmdline ).to include('--detailed-exitcodes')
+        expect( cmdline ).to include('--verbose')
+      }
+
+      subject.apply_manifest_on(
         agent,
-        'puppet_command',
-        :acceptable_exit_codes => [1,2,3,4,5,6]
+        'class { "boo": }',
+        :acceptable_exit_codes => (1..5),
+        :future_parser         => true,
+        :expect_failures       => true
       )
+    end
 
+    it 'can set the --noops flag' do
+      subject.should_receive( :create_remote_file ).and_return( true )
+      expect( subject ).to receive( :on ).with {|h, command, opts|
+        cmdline = command.cmd_line( h )
+        expect( h ).to be == agent
+        expect( cmdline ).to include('puppet apply')
+        expect( cmdline ).to include('--detailed-exitcodes')
+        expect( cmdline ).to include('--verbose')
+        expect( cmdline ).to include('--noop')
+      }
       subject.apply_manifest_on(
         agent,
         'class { "boo": }',
         :acceptable_exit_codes => (1..5),
-        :future_parser         => true,
+        :noop                  => true,
         :expect_failures       => true
       )
     end

data/spec/beaker/dsl/install_utils_spec.rb

@@ -297,6 +297,16 @@ describe ClassMixedWithDSLInstallUtils do
         expect(subject).to receive(:on).with(hosts[0], 'yum install -y puppet')
         subject.install_puppet
       end
+      it 'installs specific version of puppet when passed :version' do
+        expect(subject).to receive(:on).with(hosts[0], 'yum install -y puppet-3000')
+        subject.install_puppet( :version => '3000' )
+      end
+      it 'can install specific versions of puppets dependencies' do
+        expect(subject).to receive(:on).with(hosts[0], 'yum install -y puppet-3000')
+        expect(subject).to receive(:on).with(hosts[0], 'yum install -y hiera-2001')
+        expect(subject).to receive(:on).with(hosts[0], 'yum install -y facter-1999')
+        subject.install_puppet( :version => '3000', :facter_version => '1999', :hiera_version => '2001' )
+      end
     end
     context 'on el-5' do
       let(:platform) { "el-5-i386" }
@@ -316,30 +326,34 @@ describe ClassMixedWithDSLInstallUtils do
     end
     context 'on debian' do
       let(:platform) { "debian-7-amd64" }
-      it 'installs' do
+      it 'installs latest if given no version info' do
         expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-\$\(lsb_release -c -s\)\.deb/)
         expect(subject).to receive(:on).with(hosts[0], 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb')
         expect(subject).to receive(:on).with(hosts[0], 'apt-get update')
         expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y puppet')
         subject.install_puppet
       end
-    end
-    context 'on ubuntu' do
-      let(:platform) { "ubuntu-12.04-amd64" }
-      it 'installs' do
-        expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-\$\(lsb_release -c -s\)\.deb/)
-        expect(subject).to receive(:on).with(hosts[0], 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb')
-        expect(subject).to receive(:on).with(hosts[0], 'apt-get update')
-        expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y puppet')
-        subject.install_puppet
+      it 'installs specific version of puppet when passed :version' do
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y puppet=3000-1puppetlabs1')
+        subject.install_puppet( :version => '3000' )
+      end
+      it 'can install specific versions of puppets dependencies' do
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y puppet=3000-1puppetlabs1')
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y hiera=2001-1puppetlabs1')
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y facter=1999-1puppetlabs1')
+        subject.install_puppet( :version => '3000', :facter_version => '1999', :hiera_version => '2001' )
       end
     end
-    context 'on solaris' do
+    describe 'on unsupported platforms' do
       let(:platform) { 'solaris-11-x86_64' }
-      it 'raises an error' do
+      it 'by default raises an error' do
         expect(subject).to_not receive(:on)
         expect { subject.install_puppet }.to raise_error(/unsupported platform/)
       end
+      it 'falls back to installing from gem when given :default_action => "gem_install"' do
+        expect(subject).to receive(:on).with(hosts[0], /gem install/)
+        subject.install_puppet :default_action => 'gem_install'
+      end
     end
   end
 

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

@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+module Beaker
+  describe Unix::Pkg do
+    class UnixPkgTest
+      include Unix::Pkg
+
+      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) { UnixPkgTest.new(opts, logger) }
+
+    context "check_for_package" do
+
+      it "runs the correctly on sles" do
+        @opts = {'platform' => 'sles-is-me'}
+        pkg = 'sles_package'
+        Beaker::Command.should_receive(:new).with("zypper se -i --match-exact #{pkg}").and_return('')
+        instance.should_receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
+ 
+      it "runs the correctly on fedora" do
+        @opts = {'platform' => 'fedora-is-me'}
+        pkg = 'fedora_package'
+        Beaker::Command.should_receive(:new).with("rpm -q #{pkg}").and_return('')
+        instance.should_receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
+
+      it "runs the correctly on centos" do
+        @opts = {'platform' => 'centos-is-me'}
+        pkg = 'centos_package'
+        Beaker::Command.should_receive(:new).with("rpm -q #{pkg}").and_return('')
+        instance.should_receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
+
+      it "runs the correctly on el-" do
+        @opts = {'platform' => 'el-is-me'}
+        pkg = 'el_package'
+        Beaker::Command.should_receive(:new).with("rpm -q #{pkg}").and_return('')
+        instance.should_receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
+
+      it "runs the correctly on debian" do
+        @opts = {'platform' => 'debian-is-me'}
+        pkg = 'debian_package'
+        Beaker::Command.should_receive(:new).with("dpkg -s #{pkg}").and_return('')
+        instance.should_receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
+
+      it "runs the correctly on ubuntu" do
+        @opts = {'platform' => 'ubuntu-is-me'}
+        pkg = 'ubuntu_package'
+        Beaker::Command.should_receive(:new).with("dpkg -s #{pkg}").and_return('')
+        instance.should_receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
+
+      it "runs the correctly on solaris-11" do
+        @opts = {'platform' => 'solaris-11-is-me'}
+        pkg = 'solaris-11_package'
+        Beaker::Command.should_receive(:new).with("pkg info #{pkg}").and_return('')
+        instance.should_receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
+
+      it "runs the correctly on solaris-10" do
+        @opts = {'platform' => 'solaris-10-is-me'}
+        pkg = 'solaris-10_package'
+        Beaker::Command.should_receive(:new).with("pkginfo #{pkg}").and_return('')
+        instance.should_receive(:exec).with('', :acceptable_exit_codes => (0...127)).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
+
+      it "returns false for el-4" do
+        @opts = {'platform' => 'el-4-is-me'}
+        pkg = 'el-4_package'
+        expect( instance.check_for_package(pkg) ).to be === false
+      end
+
+      it "raises on unknown platform" do
+        @opts = {'platform' => 'nope-is-me'}
+        pkg = 'nope_package'
+        expect{ instance.check_for_package(pkg) }.to raise_error
+
+      end
+       
+     end
+ 
+   end
+ end
+ 

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -6,7 +6,7 @@ describe Beaker do
   let( :apt_cfg )        { Beaker::HostPrebuiltSteps::APT_CFG }
   let( :ips_pkg_repo )   { Beaker::HostPrebuiltSteps::IPS_PKG_REPO }
   let( :sync_cmd )       { Beaker::HostPrebuiltSteps::ROOT_KEYS_SYNC_CMD }
-  let( :pkgs )           { Beaker::HostPrebuiltSteps::PACKAGES }
+  let( :windows_pkgs )   { Beaker::HostPrebuiltSteps::WINDOWS_PACKAGES }
   let( :unix_only_pkgs ) { Beaker::HostPrebuiltSteps::UNIX_PACKAGES }
   let( :sles_only_pkgs ) { Beaker::HostPrebuiltSteps::SLES_PACKAGES }
   let( :platform )       { @platform || 'unix' }
@@ -310,10 +310,6 @@ describe Beaker do
     it "can validate unix hosts" do
 
       hosts.each do |host|
-        pkgs.each do |pkg|
-          host.should_receive( :check_for_package ).with( pkg ).once.and_return( false )
-          host.should_receive( :install_package ).with( pkg ).once
-        end
         unix_only_pkgs.each do |pkg|
           host.should_receive( :check_for_package ).with( pkg ).once.and_return( false )
           host.should_receive( :install_package ).with( pkg ).once
@@ -329,14 +325,10 @@ describe Beaker do
       @platform = 'windows'
 
       hosts.each do |host|
-        pkgs.each do |pkg|
+        windows_pkgs.each do |pkg|
           host.should_receive( :check_for_package ).with( pkg ).once.and_return( false )
           host.should_receive( :install_package ).with( pkg ).once
         end
-        unix_only_pkgs.each do |pkg|
-          host.should_receive( :check_for_package).with( pkg ).never
-          host.should_receive( :install_package ).with( pkg ).never
-        end
       end
 
       subject.validate_host(hosts, logger)
@@ -347,14 +339,6 @@ describe Beaker do
       @platform = 'sles-13.1-x64'
 
       hosts.each do |host|
-        pkgs.each do |pkg|
-          host.should_receive( :check_for_package ).with( pkg ).once.and_return( false )
-          host.should_receive( :install_package ).with( pkg ).once
-        end
-        unix_only_pkgs.each do |pkg|
-          host.should_receive( :check_for_package).with( pkg ).never
-          host.should_receive( :install_package ).with( pkg ).never
-        end
         sles_only_pkgs.each do |pkg|
           host.should_receive( :check_for_package).with( pkg ).once.and_return( false )
           host.should_receive( :install_package ).with( pkg ).once