beaker 2.18.3 → 2.19.0

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

@@ -19,8 +19,9 @@ describe ClassMixedWithDSLInstallUtils do
   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 ) }
+                                      :platform => 'linux',
+                                      :roles => [ 'agent' ],
+                                      :type => 'pe'}, 4 ) }
   let(:hosts)         { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
                         basic_hosts[1][:platform] = 'windows'
                         basic_hosts[2][:platform] = 'osx-10.9-x86_64'
@@ -29,23 +30,28 @@ describe ClassMixedWithDSLInstallUtils do
   let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3] ] }
   let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
                                                 :pe_ver => '3.0',
+                                                :type => 'pe',
                                                 :working_dir => '/tmp' } ) }
   let(:machost)       { make_host( 'machost', { :platform => 'osx-10.9-x86_64',
                                                 :pe_ver => '3.0',
+                                                :type => 'pe',
                                                 :working_dir => '/tmp' } ) }
   let(:unixhost)      { make_host( 'unixhost', { :platform => 'linux',
                                                  :pe_ver => '3.0',
+                                                :type => 'pe',
                                                  :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',
+                                                :type => 'pe',
                                                 :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
+    it 'uses aio paths for hosts of role aio' do
       hosts.each do |host|
-        host[:type] = 'aio'
+        host[:roles] = host[:roles] | ['aio']
       end
+      expect(subject).to receive(:add_pe_defaults_on).exactly(hosts.length).times
       expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
       expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
 
@@ -57,33 +63,50 @@ describe ClassMixedWithDSLInstallUtils do
         host[:type] = 'pe'
       end
       expect(subject).to receive(:add_pe_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_aio_defaults_on).never
       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
+    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 no paths for hosts with no type' do
+      hosts.each do |host|
+        host[:type] = nil
+      end
+      expect(subject).to receive(:add_pe_defaults_on).never
+      expect(subject).to receive(:add_aio_defaults_on).never
+      expect(subject).to receive(:add_puppet_paths_on).never
+
+      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_pe_defaults_on).exactly(hosts.length).times
       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
+    it 'uses pe 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_aio_defaults_on).never
       expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
 
       subject.configure_pe_defaults_on( hosts )
@@ -112,13 +135,6 @@ describe ClassMixedWithDSLInstallUtils do
 
   describe 'installer_cmd' do
 
-    it 'generates a windows PE install command for a windows host' do
-      winhost['dist'] = 'puppet-enterprise-3.0'
-      allow( subject ).to receive( :hosts ).and_return( [ hosts[1], hosts[0], hosts[2], winhost ] )
-      allow( winhost ).to receive( :is_cygwin?).and_return(true)
-      expect( subject.installer_cmd( winhost, {} ) ).to be === "cd /tmp && cmd /C 'start /w msiexec.exe /qn /L*V tmp.log /i puppet-enterprise-3.0.msi PUPPET_MASTER_SERVER=vm1 PUPPET_AGENT_CERTNAME=winhost'"
-    end
-
     it 'generates a unix PE install command for a unix host' do
       the_host = unixhost.dup
       the_host['pe_installer'] = 'puppet-enterprise-installer'
@@ -353,7 +369,9 @@ describe ClassMixedWithDSLInstallUtils do
       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( :on ).with( hosts[1], /msiexec.exe/ ).once
+      expect( subject ).to receive( :install_msi_on ).with ( any_args ) do | host, msi_path, msi_opts, opts |
+        expect( host ).to eq( hosts[1] )
+      end.once
       expect( subject ).to receive( :on ).with( hosts[2], / hdiutil attach puppet-enterprise-3.0-osx-10.9-x86_64.dmg && installer -pkg \/Volumes\/puppet-enterprise-3.0\/puppet-enterprise-installer-3.0.pkg -target \// ).once
       expect( subject ).to receive( :on ).with( hosts[3], /^Cli/ ).once
       #does extra mac/EOS specific commands
@@ -458,7 +476,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[2],
                                                                                      {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>hosts[2][:pe_ver], :puppet_collection=>nil} ).once
       hosts.each do |host|
-        expect( subject ).to receive( :add_aio_defaults_on ).with( host ).once
+        expect( subject ).to receive( :configure_type_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
@@ -513,11 +531,7 @@ describe ClassMixedWithDSLInstallUtils do
                                                                                       {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>hosts[1][:pe_ver], :puppet_collection=>nil} ).once
       expect( subject ).to receive( :on ).with( hosts[2], /puppet-enterprise-installer/ ).once
       hosts.each do |host|
-        if subject.aio_version?(host)
-          expect( subject ).to receive( :add_aio_defaults_on ).with( host ).once
-        else
-          expect( subject ).to receive( :add_pe_defaults_on ).with( host ).once
-        end
+        expect( subject ).to receive( :configure_type_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
@@ -529,6 +543,62 @@ describe ClassMixedWithDSLInstallUtils do
       subject.do_install( hosts, opts )
     end
 
+    it 'sets puppet-agent acceptable_exit_codes correctly for config helper on upgrade' do
+      hosts = make_hosts({
+                           :pe_ver => '4.0',
+                           :roles => ['agent'],
+                         }, 2)
+      hosts[0][:roles] = ['master', 'database', 'dashboard']
+      hosts[1][: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 )
+      allow( subject ).to receive( :version_is_less ).with('3.8', '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
+      allow( subject ).to receive( :create_remote_file ).with( hosts[0], /answers/, /q/ )
+      #run installer on all hosts
+      allow( subject ).to receive( :on ).with( hosts[0], /puppet-enterprise-installer/ )
+      allow( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[1],
+                                                                                      {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>hosts[1][:pe_ver], :puppet_collection=>nil} )
+      # expect( subject ).to receive( :on ).with( hosts[2], /puppet-enterprise-installer/ ).once
+      hosts.each do |host|
+        allow( subject ).to receive( :add_pe_defaults_on ).with( host ) unless subject.aio_version?(host)
+        allow( subject ).to receive( :sign_certificate_for ).with( host )
+        allow( subject ).to receive( :stop_agent_on ).with( host )
+        allow( subject ).to receive( :on ).with( host, /puppet agent -t/, :acceptable_exit_codes => [0,2] )
+      end
+      #wait for puppetdb to start
+      allow( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ) #wait for all hosts to appear in the dashboard
+      #run puppet agent now that installation is complete
+      allow( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] )
+
+      opts[:type] = :upgrade
+      expect( subject ).to receive( :setup_defaults_and_config_helper_on ).with( hosts[1], hosts[0], [0, 1, 2] )
+      subject.do_install( hosts, opts )
+    end
+
   end
 
   describe 'do_higgs_install' do
@@ -576,7 +646,7 @@ describe ClassMixedWithDSLInstallUtils do
                                         opts ).once
       #check to see if the higgs installation has proceeded correctly, works on second check
       expect( subject ).to receive( :on ).with( hosts[0], /cat #{hosts[0]['higgs_file']}/, { :accept_all_exit_codes => true }).exactly(10).times.and_return( @fail_result )
-      expect{ subject.do_higgs_install( hosts[0], opts ) }.to raise_error
+      expect{ subject.do_higgs_install( hosts[0], opts ) }.to raise_error RuntimeError, "Failed to kick off PE (Higgs) web installation"
     end
 
   end
@@ -605,6 +675,13 @@ describe ClassMixedWithDSLInstallUtils do
         expect( h['pe_ver'] ).to be === '2.8'
       end
     end
+
+    it 'can act upon a single host' do
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      allow( subject ).to receive( :sorted_hosts ).and_return( [hosts[0]] )
+      expect( subject ).to receive( :do_install ).with( [hosts[0]], {} )
+      subject.install_pe_on(hosts[0], {})
+    end
   end
 
   describe 'install_higgs' do
@@ -674,6 +751,19 @@ describe ClassMixedWithDSLInstallUtils do
       end
     end
 
+    it 'can act upon a single host' do
+      allow( Beaker::Options::PEVersionScraper ).to receive( :load_pe_version ).and_return( '3.1' )
+      allow( Beaker::Options::PEVersionScraper ).to receive( :load_pe_version_win ).and_return( '3.1' )
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      allow( subject ).to receive( :version_is_less ).with('3.0', '3.4.0').and_return( true )
+      allow( subject ).to receive( :version_is_less ).with('3.1', '3.0').and_return( false )
+      allow( subject ).to receive( :sorted_hosts ).and_return( [hosts[0]] )
+      version = version_win = '3.1'
+      path = "/path/to/upgradepkg"
+      expect( subject ).to receive( :do_install ).with( [hosts[0]], {:type=>:upgrade, :set_console_password=>true} )
+      subject.upgrade_pe_on(hosts[0], {}, path)
+    end
+
   end
 
   describe 'fetch_and_push_pe' do

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

@@ -70,4 +70,61 @@ describe ClassMixedWithDSLInstallUtils do
       subject.configure_defaults_on(hosts, 'foss')
     end
   end
+
+  describe "#configure_type_defaults_on" do
+
+    it "can set foss defaults for foss type" do
+      hosts.each do |host|
+        host['type'] = 'foss'
+      end
+      expect(subject).to receive(:add_foss_defaults_on).exactly(hosts.length).times
+      subject.configure_type_defaults_on(hosts)
+    end
+
+    it "adds aio defaults to foss hosts when they have an aio foss puppet version" do
+      hosts.each do |host|
+        host['type'] = 'foss'
+        host['version'] = '4.0'
+      end
+      expect(subject).to receive(:add_foss_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
+      subject.configure_type_defaults_on(hosts)
+    end
+
+    it "adds aio defaults to foss hosts when they have type foss-aio" do
+      hosts.each do |host|
+        host['type'] = 'foss-aio'
+      end
+      expect(subject).to receive(:add_foss_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
+      subject.configure_type_defaults_on(hosts)
+    end
+
+    it "can set aio defaults for aio type (backwards compatability)" do
+      hosts.each do |host|
+        host['type'] = 'aio'
+      end
+      expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
+      subject.configure_type_defaults_on(hosts)
+    end
+
+    it "can set pe defaults for pe type" do
+      hosts.each do |host|
+        host['type'] = 'pe'
+      end
+      expect(subject).to receive(:add_pe_defaults_on).exactly(hosts.length).times
+      subject.configure_type_defaults_on(hosts)
+    end
+
+    it "adds aio defaults to pe hosts when they an aio pe version" do
+      hosts.each do |host|
+        host['type'] = 'pe'
+        host['pe_ver'] = '4.0'
+      end
+      expect(subject).to receive(:add_pe_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
+      subject.configure_type_defaults_on(hosts)
+    end
+
+  end
 end

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

@@ -0,0 +1,132 @@
+require 'spec_helper'
+
+class ClassMixedWithDSLInstallUtils
+  include Beaker::DSL::Helpers
+  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(:windows_temp)        { 'C:\\Windows\\Temp' }
+  let(:msi_path)            { 'c:\\foo\\puppet.msi' }
+  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(:hosts)              { [ winhost, winhost_non_cygwin ] }
+
+  def expect_install_called(times = hosts.length)
+    result = expect( Beaker::Command ).to receive( :new )
+      .with( /^"#{Regexp.quote(windows_temp)}\\install-puppet-msi.*\.bat"$/, [], {:cmdexe => true})
+      .exactly( times ).times
+
+    yield result if block_given?
+  end
+
+  def expect_status_called(times = hosts.length)
+    expect( Beaker::Command ).to receive( :new )
+      .with( "sc query puppet || sc query pe-puppet", [], {:cmdexe => true} )
+      .exactly( times ).times
+  end
+
+  def expect_script_matches(hosts, contents)
+    hosts.each do |host|
+      expect( host )
+        .to receive( :do_scp_to ) do |local_path, remote_path|
+          expect(File.read(local_path)).to match(contents)
+        end
+        .and_return( true )
+    end
+  end
+
+  describe "#install_msi_on" do
+    before :each do
+      FakeFS::FileSystem.add(File.expand_path '/tmp')
+
+      allow( subject ).to receive( :on ).and_return( true )
+      allow( subject ).to receive( :get_temp_path ).and_return( windows_temp )
+    end
+
+    it "will specify a PUPPET_AGENT_STARTUP_MODE of Manual (disabling the service) by default" do
+      expect_install_called
+      expect_status_called
+      expected_cmd = /^start \/w msiexec\.exe \/i "c:\\foo\\puppet.msi" \/qn \/L\*V .*\.log PUPPET_AGENT_STARTUP_MODE=Manual$/
+      expect_script_matches(hosts, expected_cmd)
+      subject.install_msi_on(hosts, msi_path, {})
+    end
+
+    it "allows configuration of PUPPET_AGENT_STARTUP_MODE" do
+      expect_install_called
+      expect_status_called
+      expected_cmd = /^start \/w msiexec\.exe \/i "c:\\foo\\puppet.msi" \/qn \/L\*V .*\.log PUPPET_AGENT_STARTUP_MODE=Automatic$/
+      expect_script_matches(hosts, expected_cmd)
+      subject.install_msi_on(hosts, msi_path, {'PUPPET_AGENT_STARTUP_MODE' => 'Automatic'})
+    end
+
+    it "will generate an appropriate command with a MSI file path using non-Windows slashes" do
+      expect_install_called
+      expect_status_called
+      msi_path = 'c:/foo/puppet.msi'
+      expected_cmd = /^start \/w msiexec\.exe \/i "c:\\foo\\puppet.msi" \/qn \/L\*V .*\.log PUPPET_AGENT_STARTUP_MODE=Manual$/
+      expect_script_matches(hosts, expected_cmd)
+      subject.install_msi_on(hosts, msi_path)
+    end
+
+    it "will generate an appropriate command with a MSI http(s) url" do
+      expect_install_called
+      expect_status_called
+      msi_url = "https://downloads.puppetlabs.com/puppet.msi"
+      expected_cmd = /^start \/w msiexec\.exe \/i "https\:\/\/downloads\.puppetlabs\.com\/puppet\.msi" \/qn \/L\*V .*\.log PUPPET_AGENT_STARTUP_MODE=Manual$/
+      expect_script_matches(hosts, expected_cmd)
+      subject.install_msi_on(hosts, msi_url)
+    end
+
+    it "will generate an appropriate command with a MSI file url" do
+      expect_install_called
+      expect_status_called
+      msi_url = "file://c:\\foo\\puppet.msi"
+      expected_cmd = /^start \/w msiexec\.exe \/i "file\:\/\/c:\\foo\\puppet\.msi" \/qn \/L\*V .*\.log PUPPET_AGENT_STARTUP_MODE=Manual$/
+      expect_script_matches(hosts, expected_cmd)
+      subject.install_msi_on(hosts, msi_url)
+    end
+
+    it "will not generate a command to emit a log file without the :debug option set" do
+      expect_install_called
+      expect_status_called
+      hosts.each { |h| allow( h ).to receive( :do_scp_to ).and_return( true ) }
+      expect( Beaker::Command ).not_to receive( :new ).with( /^type .*\.log$/, [], {:cmdexe => true} )
+      subject.install_msi_on(hosts, msi_path)
+    end
+
+    it "will generate a command to emit a log file when the install script fails" do
+      # note a single failure aborts executing against remaining hosts
+      hosts_affected = 1
+
+      expect_install_called(hosts_affected) { |e| e.and_raise }
+      expect_status_called(0)
+      hosts.each { |h| allow( h ).to receive( :do_scp_to ).and_return( true ) }
+
+      expect( Beaker::Command ).to receive( :new ).with( /^type \".*\.log\"$/, [], {:cmdexe => true} ).exactly( hosts_affected ).times
+      expect { subject.install_msi_on(hosts, msi_path) }.to raise_error(RuntimeError)
+    end
+
+    it "will generate a command to emit a log file with the :debug option set" do
+      expect_install_called
+      expect_status_called
+      hosts.each { |h| allow( h ).to receive( :do_scp_to ).and_return( true ) }
+
+      expect( Beaker::Command ).to receive( :new ).with( /^type \".*\.log\"$/, [], {:cmdexe => true} ).exactly( hosts.length ).times
+      subject.install_msi_on(hosts, msi_path, {}, { :debug => true })
+    end
+  end
+end

data/spec/beaker/dsl/roles_spec.rb

@@ -116,22 +116,53 @@ describe ClassMixedWithDSLRoles do
     end
   end
   describe '#aio_version?' do
-    it 'returns true if the host doesn\'t have a :pe_ver' do
+    it 'returns false if the host doesn\'t have a :pe_ver or :version' do
       agent1[:pe_ver] = nil
-      expect( subject.aio_version?(agent1) ).to be === true
+      agent1[:version] = nil
+      expect( subject.aio_version?(agent1) ).to be === false
+    end
+    it 'returns false if :version < 4.0 and pe_ver is nil, type foss' do
+      agent1[:pe_ver] = nil
+      agent1[:version] = '3.8'
+      agent1[:type] = 'foss'
+      expect( subject.aio_version?(agent1) ).to be === false
     end
     it 'returns false if the host :pe_ver is set < 4.0' do
       agent1[:pe_ver] = '3.8'
       expect( subject.aio_version?(agent1) ).to be === false
     end
+    it 'returns false if the host :version is set < 4.0' do
+      agent1[:version] = '3.8'
+      expect( subject.aio_version?(agent1) ).to be === false
+    end
     it 'returns true if the host :pe_ver is 4.0' do
       agent1[:pe_ver] = '4.0'
       expect( subject.aio_version?(agent1) ).to be === true
     end
+    it 'returns true if the host :version is 4.0' do
+      agent1[:version] = '4.0'
+      expect( subject.aio_version?(agent1) ).to be === true
+    end
     it 'returns true if the host :pe_ver is 2015.5' do
       agent1[:pe_ver] = '2015.5'
       expect( subject.aio_version?(agent1) ).to be === true
     end
+    it 'returns true if the host has role aio' do
+      agent1[:roles] = agent1[:roles] | ['aio']
+      expect( subject.aio_version?(agent1) ).to be === true
+    end
+    it 'returns true if the host is type aio' do
+      agent1[:type] = 'aio'
+      expect( subject.aio_version?(agent1) ).to be === true
+    end
+    it 'returns true if the host is type aio-foss' do
+      agent1[:type] = 'aio-foss'
+      expect( subject.aio_version?(agent1) ).to be === true
+    end
+    it 'returns true if the host is type foss-aio' do
+      agent1[:type] = 'aio-foss'
+      expect( subject.aio_version?(agent1) ).to be === true
+    end
   end
   describe '#aio_agent?' do
     it 'returns false if agent_only check doesn\'t pass' do
@@ -172,13 +203,13 @@ describe ClassMixedWithDSLRoles do
   end
   describe '#add_role_def' do
     it 'raises an error on unsupported role format "1role"' do
-      expect { subject.add_role_def( "1role" ) }.to raise_error
+      expect { subject.add_role_def( "1role" ) }.to raise_error ArgumentError
     end
     it 'raises an error on unsupported role format "role_!a"' do
-      expect { subject.add_role_def( "role_!a" ) }.to raise_error
+      expect { subject.add_role_def( "role_!a" ) }.to raise_error ArgumentError
     end
     it 'raises an error on unsupported role format "role=="' do
-      expect { subject.add_role_def( "role==" ) }.to raise_error
+      expect { subject.add_role_def( "role==" ) }.to raise_error ArgumentError
     end
     it 'creates new method for role "role_correct!"' do
       test_role = "role_correct!"