beaker 2.14.1 → 2.15.0

data/lib/beaker/test_suite.rb

@@ -243,7 +243,7 @@ module Beaker
     #@option options [String] :xml_stylesheet The path to a stylesheet to be applied to the generated XML output
     #@param [Symbol] fail_mode One of :slow, :fast
     #@param [Time] timestamp Beaker execution start time
-    def initialize(name, hosts, options, timestamp, fail_mode = :slow)
+    def initialize(name, hosts, options, timestamp, fail_mode=nil)
       @logger     = options[:logger]
       @test_cases = []
       @test_files = options[name]
@@ -251,7 +251,7 @@ module Beaker
       @hosts      = hosts
       @run        = false
       @options    = options
-      @fail_mode  = fail_mode || @options[:fail_mode]
+      @fail_mode  = fail_mode || @options[:fail_mode] || :slow
       @test_suite_results = TestSuiteResult.new(@options, name)
       @timestamp = timestamp
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.14.1'
+    STRING = '2.15.0'
   end
 end

data/spec/beaker/cli_spec.rb

@@ -22,12 +22,12 @@ module Beaker
 
       describe "test fail mode" do
         it 'continues testing after failed test if using slow fail_mode' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'slow'
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           expect( cli ).to receive(:run_suite).exactly( 3 ).times
           expect{ cli.execute! }.to raise_error
@@ -35,12 +35,12 @@ module Beaker
         end
 
         it 'stops testing after failed test if using fast fail_mode' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           expect( cli ).to receive(:run_suite).exactly( 2 ).times
           expect{ cli.execute! }.to raise_error
@@ -50,13 +50,13 @@ module Beaker
 
       describe "SUT preserve mode" do
         it 'cleans up SUTs post testing if tests fail and preserve_hosts = never' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'never'
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -67,13 +67,13 @@ module Beaker
         end
 
         it 'cleans up SUTs post testing if no tests fail and preserve_hosts = never' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'never'
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -85,16 +85,16 @@ module Beaker
 
 
         it 'preserves SUTs post testing if no tests fail and preserve_hosts = always' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'always'
           options[:log_dated_dir] = '.'
           options[:hosts_file] = 'sample.cfg'
-          cli.instance_variable_set(:@hosts, {})
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          cli.instance_variable_set(:@hosts, {})
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -105,13 +105,13 @@ module Beaker
         end
 
         it 'preserves SUTs post testing if no tests fail and preserve_hosts = always' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'always'
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -121,13 +121,13 @@ module Beaker
         end
 
         it 'cleans up SUTs post testing if no tests fail and preserve_hosts = onfail' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onfail'
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -138,13 +138,13 @@ module Beaker
         end
 
         it 'preserves SUTs post testing if tests fail and preserve_hosts = onfail' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onfail'
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -155,13 +155,13 @@ module Beaker
         end
 
         it 'cleans up SUTs post testing if tests fail and preserve_hosts = onpass' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onpass'
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -172,9 +172,6 @@ module Beaker
         end
 
         it 'preserves SUTs post testing if no tests fail and preserve_hosts = onpass' do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onpass'
@@ -182,6 +179,9 @@ module Beaker
           options[:hosts_file] = 'sample.cfg'
           cli.instance_variable_set(:@hosts, {})
           cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
@@ -194,13 +194,14 @@ module Beaker
       describe 'hosts file saving when preserve_hosts should happen' do
 
         before :each do
-          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
-          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onpass'
           options[:hosts_file] = 'sample.cfg'
+          cli.instance_variable_set(:@options, options)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests, options[:fail_mode]).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
 
           hosts = [
             make_host('petey', { :hypervisor => 'peterPan' }),

data/spec/beaker/dsl/helpers/puppet_helpers_spec.rb

@@ -587,7 +587,7 @@ describe ClassMixedWithDSLHelpers do
           expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(2).times
         end
 
-        it 'yields to a block after bouncing service' do
+        it 'yields to a block in between bouncing service calls' do
           execution = 0
           allow( subject ).to receive(:curl_with_retries)
           expect do
@@ -600,13 +600,33 @@ describe ClassMixedWithDSLHelpers do
           expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=running/).exactly(2).times
           expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(2).times
         end
+
+        context ':restart_when_done flag set false' do
+          it 'starts puppet once, stops it twice' do
+            subject.with_puppet_running_on(host, { :restart_when_done => false })
+            expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=running/).once
+            expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(2).times
+          end
+
+          it 'yields to a block after bouncing service' do
+            execution = 0
+            allow( subject ).to receive(:curl_with_retries)
+            expect do
+              subject.with_puppet_running_on(host, { :restart_when_done => false }) do
+                expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=running/).exactly(1).times
+                expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(1).times
+                execution += 1
+              end
+            end.to change { execution }.by(1)
+            expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(2).times
+          end
+        end
       end
 
       context 'for foss packaged hosts using passenger' do
         before(:each) do
           host.uses_passenger!
         end
-
         it 'bounces puppet twice' do
           allow( subject ).to receive(:curl_with_retries)
           subject.with_puppet_running_on(host, {})
@@ -624,19 +644,38 @@ describe ClassMixedWithDSLHelpers do
           end.to change { execution }.by(1)
           expect(host).to execute_commands_matching(/apache2ctl graceful/).exactly(2).times
         end
+
+        context ':restart_when_done flag set false' do
+          it 'bounces puppet once' do
+            allow( subject ).to receive(:curl_with_retries)
+            subject.with_puppet_running_on(host, { :restart_when_done => false })
+            expect(host).to execute_commands_matching(/apache2ctl graceful/).once
+          end
+
+          it 'yields to a block after bouncing service' do
+            execution = 0
+            allow( subject ).to receive(:curl_with_retries)
+            expect do
+              subject.with_puppet_running_on(host, { :restart_when_done => false }) do
+                expect(host).to execute_commands_matching(/apache2ctl graceful/).once
+                execution += 1
+              end
+            end.to change { execution }.by(1)
+          end
+        end
       end
 
       context 'for foss packaged hosts using webrick' do
         let(:use_service) { true }
 
-        it 'stops and starts master using service scripts' do
+        it 'stops and starts master using service scripts twice' do
           allow( subject ).to receive(:curl_with_retries)
           subject.with_puppet_running_on(host, {})
           expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=running/).exactly(2).times
           expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(2).times
         end
 
-        it 'yields to a block after stopping and starting service' do
+        it 'yields to a block in between bounce calls for the service' do
           execution = 0
           expect do
             subject.with_puppet_running_on(host, {}) do
@@ -648,6 +687,26 @@ describe ClassMixedWithDSLHelpers do
           expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=running/).exactly(2).times
           expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(2).times
         end
+
+        context ':restart_when_done flag set false' do
+          it 'stops (twice) and starts (once) master using service scripts' do
+            allow( subject ).to receive(:curl_with_retries)
+            subject.with_puppet_running_on(host, { :restart_when_done => false })
+            expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=running/).once
+            expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(2).times
+          end
+
+          it 'yields to a block after stopping and starting service' do
+            execution = 0
+            expect do
+              subject.with_puppet_running_on(host, { :restart_when_done => false }) do
+                expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=running/).once
+                expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).once
+                execution += 1
+              end
+            end.to change { execution }.by(1)
+          end
+        end
       end
 
       context 'running from source' do
@@ -691,6 +750,18 @@ describe ClassMixedWithDSLHelpers do
             subject.with_puppet_running_on(host, {:__commandline_args__ => '--with arg'})
             expect(host).to execute_commands_matching(/^puppet master --with arg/).once
           end
+
+          it 'is not affected by the :restart_when_done flag' do
+            execution = 0
+            expect do
+              subject.with_puppet_running_on(host, { :restart_when_done => true }) do
+                expect(host).to execute_commands_matching(/^puppet master/).exactly(4).times
+                execution += 1
+              end
+            end.to change { execution }.by(1)
+            expect(host).to execute_commands_matching(/^kill [^-]/).once
+            expect(host).to execute_commands_matching(/^kill -0/).once
+          end
         end
       end
 
@@ -722,7 +793,7 @@ describe ClassMixedWithDSLHelpers do
           end
 
           it 'restores puppet.conf before restarting' do
-            subject.with_puppet_running_on(host, {})
+            subject.with_puppet_running_on(host, { :restart_when_done => true })
             expect(host).to execute_commands_matching_in_order(/cat '#{backup_location}' > '#{original_location}'/,
                                                                /ensure=stopped/,
                                                                /ensure=running/)
@@ -807,9 +878,9 @@ describe ClassMixedWithDSLHelpers do
     it 'delegates to #with_puppet_running_on with the default host' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
 
-      expect( subject ).to receive( :with_puppet_running_on ).with( master, {:opt => 'value'}, '/dir').once
+      expect( subject ).to receive( :with_puppet_running_on ).with( master, {:opt => 'value'}, '/dir' ).once
 
-      subject.with_puppet_running( {:opt => 'value'}, '/dir'  )
+      subject.with_puppet_running( {:opt => 'value'}, '/dir' )
 
 
     end

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

@@ -47,6 +47,56 @@ describe ClassMixedWithDSLInstallUtils do
                                                 :dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
 
 
+  context '#configure_foss_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_foss_defaults_on( hosts )
+    end
+
+    it 'uses foss paths for hosts of type foss' do
+      hosts.each do |host|
+        host[:type] = 'foss'
+      end
+      expect(subject).to receive(:add_foss_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
+
+      subject.configure_foss_defaults_on( hosts )
+    end
+
+    it 'uses foss paths for hosts with no type and version < 4.0' do
+      expect(subject).to receive(:add_foss_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
+
+      subject.configure_foss_defaults_on( hosts )
+    end
+
+    it 'uses aio paths for hosts of version >= 4.0' do
+      hosts.each do |host|
+        host[:version] = '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_foss_defaults_on( hosts )
+    end
+
+    it 'uses foss paths for hosts of version < 4.0' do
+      hosts.each do |host|
+        host[:version] = '3.8'
+      end
+      expect(subject).to receive(:add_foss_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
+
+      subject.configure_foss_defaults_on( hosts )
+    end
+
+  end
+
   context 'extract_repo_info_from' do
     [{ :protocol => 'git', :path => 'git://github.com/puppetlabs/project.git' },
      { :protocol => 'ssh', :path => 'git@github.com:puppetlabs/project.git' },
@@ -208,14 +258,14 @@ describe ClassMixedWithDSLInstallUtils do
         subject.install_puppet
       end
       it 'installs specific version of puppet when passed :version' do
-        expect(hosts[0]).to receive(:install_package).with('puppet-3000')
-        subject.install_puppet( :version => '3000' )
+        expect(hosts[0]).to receive(:install_package).with('puppet-3')
+        subject.install_puppet( :version => '3' )
       end
       it 'can install specific versions of puppets dependencies' do
-        expect(hosts[0]).to receive(:install_package).with('puppet-3000')
+        expect(hosts[0]).to receive(:install_package).with('puppet-3')
         expect(hosts[0]).to receive(:install_package).with('hiera-2001')
         expect(hosts[0]).to receive(:install_package).with('facter-1999')
-        subject.install_puppet( :version => '3000', :facter_version => '1999', :hiera_version => '2001' )
+        subject.install_puppet( :version => '3', :facter_version => '1999', :hiera_version => '2001' )
       end
     end
     context 'on el-5' do
@@ -244,16 +294,16 @@ describe ClassMixedWithDSLInstallUtils do
         subject.install_puppet
       end
       it 'installs specific version of puppet when passed :version' do
-        expect(hosts[0]).to receive(:install_package).with('puppet=3000-1puppetlabs1')
-        expect(hosts[0]).to receive(:install_package).with('puppet-common=3000-1puppetlabs1')
-        subject.install_puppet( :version => '3000' )
+        expect(hosts[0]).to receive(:install_package).with('puppet=3-1puppetlabs1')
+        expect(hosts[0]).to receive(:install_package).with('puppet-common=3-1puppetlabs1')
+        subject.install_puppet( :version => '3' )
       end
       it 'can install specific versions of puppets dependencies' do
         expect(hosts[0]).to receive(:install_package).with('facter=1999-1puppetlabs1')
         expect(hosts[0]).to receive(:install_package).with('hiera=2001-1puppetlabs1')
-        expect(hosts[0]).to receive(:install_package).with('puppet-common=3000-1puppetlabs1')
-        expect(hosts[0]).to receive(:install_package).with('puppet=3000-1puppetlabs1')
-        subject.install_puppet( :version => '3000', :facter_version => '1999', :hiera_version => '2001' )
+        expect(hosts[0]).to receive(:install_package).with('puppet-common=3-1puppetlabs1')
+        expect(hosts[0]).to receive(:install_package).with('puppet=3-1puppetlabs1')
+        subject.install_puppet( :version => '3', :facter_version => '1999', :hiera_version => '2001' )
       end
     end
     context 'on windows' do
@@ -261,17 +311,17 @@ describe ClassMixedWithDSLInstallUtils do
       it 'installs specific version of puppet when passed :version' do
         allow(hosts[0]).to receive(:is_cygwin?).and_return(true)
         allow(subject).to receive(:link_exists?).and_return( true )
-        expect(subject).to receive(:on).with(hosts[0], 'curl -O http://downloads.puppetlabs.com/windows/puppet-3000.msi')
+        expect(subject).to receive(:on).with(hosts[0], 'curl -O http://downloads.puppetlabs.com/windows/puppet-3.msi')
         expect(subject).to receive(:on).with(hosts[0], " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
-        expect(subject).to receive(:on).with(hosts[0], 'cmd /C \'start /w msiexec.exe /qn /i puppet-3000.msi\'')
-        subject.install_puppet(:version => '3000')
+        expect(subject).to receive(:on).with(hosts[0], 'cmd /C \'start /w msiexec.exe /qn /i puppet-3.msi\'')
+        subject.install_puppet(:version => '3')
       end
       it 'installs from custom url when passed :win_download_url' do
         allow(hosts[0]).to receive(:is_cygwin?).and_return(true)
         allow(subject).to receive(:link_exists?).and_return( true )
-        expect(subject).to receive(:on).with(hosts[0], 'curl -O http://nightlies.puppetlabs.com/puppet-latest/repos/windows/puppet-3000.msi')
-        expect(subject).to receive(:on).with(hosts[0], 'cmd /C \'start /w msiexec.exe /qn /i puppet-3000.msi\'')
-        subject.install_puppet( :version => '3000', :win_download_url => 'http://nightlies.puppetlabs.com/puppet-latest/repos/windows' )
+        expect(subject).to receive(:on).with(hosts[0], 'curl -O http://nightlies.puppetlabs.com/puppet-latest/repos/windows/puppet-3.msi')
+        expect(subject).to receive(:on).with(hosts[0], 'cmd /C \'start /w msiexec.exe /qn /i puppet-3.msi\'')
+        subject.install_puppet( :version => '3', :win_download_url => 'http://nightlies.puppetlabs.com/puppet-latest/repos/windows' )
       end
     end
     describe 'on unsupported platforms' do
@@ -387,7 +437,7 @@ describe ClassMixedWithDSLInstallUtils do
       let( :platform ) { Beaker::Platform.new('el-7-i386') }
 
       it "installs an rpm" do
-        expect(subject).to receive(:on).with( host, /rpm .*/ ).ordered
+        expect(subject).to receive(:on).with( host, /^(rpm --replacepkgs -ivh).*/ ).ordered
         subject.install_puppetlabs_release_repo host
       end
 
@@ -551,6 +601,65 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe '#install_puppet_agent_from_msi_on' do
+    let( :opts )     { { :version => 'VERSION' } }
+    let( :platform ) { 'windows' }
+    let( :host )     { { :platform => platform } }
+
+    it 'uses x86 msi when host is_x86_64 and install_32 is set on the host' do
+      host['install_32'] = true
+
+      expect( host ).to receive( :is_x86_64? ).and_return( true )
+      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
+
+      subject.install_puppet_agent_from_msi_on( host, opts )
+      expect( host['dist'] ).to be == "puppet-agent-VERSION-x86"
+
+    end
+
+    it 'uses x86 msi when host is_x86_64 and install_32 is set on the options' do
+      opts['install_32'] = true
+
+      expect( host ).to receive( :is_x86_64? ).and_return( true )
+      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
+
+      subject.install_puppet_agent_from_msi_on( host, opts )
+      expect( host['dist'] ).to be == "puppet-agent-VERSION-x86"
+
+    end
+
+    it 'uses x86 msi when host is_x86_64 and ruby_arch is x86 on the host' do
+      host['ruby_arch'] = 'x86'
+
+      expect( host ).to receive( :is_x86_64? ).and_return( true )
+      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
+
+      subject.install_puppet_agent_from_msi_on( host, opts )
+      expect( host['dist'] ).to be == "puppet-agent-VERSION-x86"
+
+    end
+
+    it 'uses x86 msi when host !is_x86_64' do
+
+      expect( host ).to receive( :is_x86_64? ).and_return( false )
+      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
+
+      subject.install_puppet_agent_from_msi_on( host, opts )
+      expect( host['dist'] ).to be == "puppet-agent-VERSION-x86"
+
+    end
+
+    it 'uses x64 msi when host is_x86_64, no install_32 and ruby_arch != x86' do
+
+      expect( host ).to receive( :is_x86_64? ).and_return( true )
+      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
+
+      subject.install_puppet_agent_from_msi_on( host, opts )
+      expect( host['dist'] ).to be == "puppet-agent-VERSION-x64"
+
+    end
+  end
+
   describe '#install_puppetagent_dev_repo' do
 
     it 'raises an exception when host platform is unsupported' do