beaker 1.19.1 → 1.20.0

data/spec/beaker/answers_spec.rb

@@ -3,205 +3,226 @@ require 'spec_helper'
 module Beaker
   describe Answers do
     let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-    let( :options )     { Beaker::Options::Presets.presets }
+    let( :options )     { Beaker::Options::Presets.new.presets }
     let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
                           basic_hosts[1]['platform'] = 'windows'
                           basic_hosts }
-    let( :master_certname ) { 'master_certname' }
+    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
 
     it 'generates 3.4 answers for 3.4 hosts' do
       @ver = '3.4'
-      Beaker::Answers::Version34.should_receive( :answers ).with( hosts, master_certname, {}).once
-      subject.answers( @ver, hosts, master_certname, {} )
+      expect( answers ).to be_a_kind_of Version34
     end
 
     it 'generates 3.2 answers for 3.3 hosts' do
       @ver = '3.3'
-      Beaker::Answers::Version32.should_receive( :answers ).with( hosts, master_certname, {}).once
-      subject.answers( @ver, hosts, master_certname, {} )
+      expect( answers ).to be_a_kind_of Version32
     end
 
     it 'generates 3.2 answers for 3.2 hosts' do
       @ver = '3.2'
-      Beaker::Answers::Version32.should_receive( :answers ).with( hosts, master_certname, options ).once
-      subject.answers( @ver, hosts, master_certname, options )
+      expect( answers ).to be_a_kind_of Version32
     end
 
     it 'generates 3.0 answers for 3.1 hosts' do
       @ver = '3.1'
-      Beaker::Answers::Version30.should_receive( :answers ).with( hosts, master_certname, options ).once
-      subject.answers( @ver, hosts, master_certname, options )
+      expect( answers ).to be_a_kind_of Version30
     end
 
     it 'generates 3.0 answers for 3.0 hosts' do
       @ver = '3.0'
-      Beaker::Answers::Version30.should_receive( :answers ).with( hosts, master_certname, options ).once
-      subject.answers( @ver, hosts, master_certname, options )
+      expect( answers ).to be_a_kind_of Version30
     end
 
     it 'generates 2.8 answers for 2.8 hosts' do
       @ver = '2.8'
-      Beaker::Answers::Version28.should_receive( :answers ).with( hosts, master_certname, options ).once
-      subject.answers( @ver, hosts, master_certname, options )
+      expect( answers ).to be_a_kind_of Version28
     end
 
     it 'generates 2.0 answers for 2.0 hosts' do
       @ver = '2.0'
-      Beaker::Answers::Version20.should_receive( :answers ).with( hosts, master_certname, options ).once
-      subject.answers( @ver, hosts, master_certname, options )
+      expect( answers ).to be_a_kind_of Version20
     end
 
     it 'raises an error for an unknown version' do
       @ver = 'x.x'
-      expect{ subject.answers( @ver, hosts, master_certname, options ) }.to raise_error( NotImplementedError )
+      expect{ answers }.to raise_error( NotImplementedError )
     end
   end
 
-  module Answers
-    describe Version34 do
-      let( :options )     { Beaker::Options::Presets.presets }
-      let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
-      let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
-                      basic_hosts[1]['roles'] = ['dashboard', 'agent']
-                      basic_hosts[2]['roles'] = ['database', 'agent']
-                      basic_hosts }
-      let( :master_certname ) { 'master_certname' }
-      it 'should add answers to the host objects' do
-        @ver = '3.4'
-        answers = subject.answers( hosts, master_certname, options )
-        hosts.each do |host|
-          expect( host[:answers] ).to be === answers[host.name]
-        end
-      end
+  describe Version34 do
+    let( :options )     { Beaker::Options::Presets.new.presets }
+    let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
+    let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
+                    basic_hosts[0][:custom_answers] = { :q_custom => 'LOOKYHERE' }
+                    basic_hosts[1]['roles'] = ['dashboard', 'agent']
+                    basic_hosts[2]['roles'] = ['database', 'agent']
+                    basic_hosts }
+    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
+
+    before :each do
+      @ver = '3.4'
+      @answers = answers.answers
     end
 
-    describe Version32 do
-      let( :options )     { Beaker::Options::Presets.presets }
-      let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
-      let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
-                      basic_hosts[1]['roles'] = ['dashboard', 'agent']
-                      basic_hosts[2]['roles'] = ['database', 'agent']
-                      basic_hosts }
-      let( :master_certname ) { 'master_certname' }
-
-      # The only difference between 3.2 and 3.0 is the addition of the
-      # master certname to the dashboard answers
-      it 'should add q_puppetmaster_certname to the dashboard answers' do
-        @ver = '3.2'
-        expect( subject.answers( hosts, master_certname, options )['vm2']).to include :q_puppetmaster_certname
+    it 'should add answers to the host objects' do
+      hosts.each do |host|
+        expect( host[:answers] ).to be === @answers[host.name]
       end
+    end
 
-      it 'should add q_upgrade_with_unknown_disk_space to the dashboard on upgrade' do
-        @ver = '3.2'
-        expect( subject.answers( hosts, master_certname, options.merge( {:type => :upgrade} ) )['vm2']).to include :q_upgrade_with_unknown_disk_space
-      end
+    it 'appends custom answers to generated answers' do
+      expect( hosts[0][:custom_answers] ).to be == { :q_custom => 'LOOKYHERE' }
+      expect( @answers['vm1'] ).to include :q_custom
+      expect( hosts[0][:answers] ).to include :q_custom
+    end
 
-      it 'should add answers to the host objects' do
-        @ver = '3.2'
-        answers = subject.answers( hosts, master_certname, options )
-        hosts.each do |host|
-          expect( host[:answers] ).to be === answers[host.name]
-        end
-      end
+  end
+
+  describe Version32 do
+    let( :options )     { Beaker::Options::Presets.new.presets }
+    let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
+    let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
+                    basic_hosts[1]['roles'] = ['dashboard', 'agent']
+                    basic_hosts[2]['roles'] = ['database', 'agent']
+                    basic_hosts }
+    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
+    let( :upgrade_answers )     { Beaker::Answers.create(@ver, hosts, options.merge( {:type => :upgrade}) ) }
+
+    before :each do
+      @ver = '3.2'
+      @answers = answers.answers
     end
 
-    describe Version30 do
-      let( :options )     { Beaker::Options::Presets.presets }
-      let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-      let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
-                            basic_hosts[1]['platform'] = 'windows'
-                            basic_hosts }
-      let( :master_certname ) { 'master_certname' }
+    # The only difference between 3.2 and 3.0 is the addition of the
+    # master certname to the dashboard answers
+    it 'should add q_puppetmaster_certname to the dashboard answers' do
+      expect( @answers['vm2']).to include :q_puppetmaster_certname
+    end
 
-      it 'uses simple answers for upgrade from 3.0.x to 3.0.x' do
-        @ver = '3.0'
-        expect( subject.answers( hosts, master_certname, options.merge({ :type => :upgrade }) )).to be === { "vm2"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm1"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm3"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" } }
-      end
+    it 'should add q_upgrade_with_unknown_disk_space to the dashboard on upgrade' do
+      @upgrade_answers = upgrade_answers.answers
+      expect( @upgrade_answers['vm2']).to include :q_upgrade_with_unknown_disk_space
+    end
 
-      it 'sets correct answers for an agent' do
-        expect( subject.answers( hosts, master_certname, options )['vm3'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>master_certname, :q_puppetmaster_install=>"n", :q_all_in_one_install=>"n", :q_puppet_enterpriseconsole_install=>"n", :q_puppetdb_install=>"n", :q_database_install=>"n" }
+    it 'should add answers to the host objects' do
+      hosts.each do |host|
+        expect( host[:answers] ).to be === @answers[host.name]
       end
+    end
+  end
 
-      it 'sets correct answers for a master' do
-        @ver = '3.0'
-        expect( subject.answers( hosts, master_certname, options )['vm1'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>master_certname, :q_puppetmaster_install=>"y", :q_all_in_one_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetdb_install=>"y", :q_database_install=>"y", :q_puppetdb_hostname=>hosts[0], :q_puppetdb_port=>8081, :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_certname=>"master_certname", :q_puppetdb_database_name=>"pe-puppetdb", :q_puppetdb_database_user=>"mYpdBu3r", :q_puppetdb_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_database_host=>hosts[0], :q_database_port=>5432, :q_pe_database=>"y", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_database_root_password=>"'=ZYdjiP3jCwV5eo9s1MBd'", :q_database_root_user=>"pe-postgres" }
-      end
+  describe Version30 do
+    let( :options )     { Beaker::Options::Presets.new.presets }
+    let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
+    let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
+                          basic_hosts[1]['platform'] = 'windows'
+                          basic_hosts[2][:custom_answers] = { :q_custom => 'LOOKLOOKLOOK' }
+                          basic_hosts }
+    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
+    let( :upgrade_answers )     { Beaker::Answers.create(@ver, hosts, options.merge( {:type => :upgrade}) ) }
 
-      it 'generates nil answers for a windows host' do
-        @ver = '3.0'
-        expect( subject.answers( hosts, master_certname, options )['vm2'] ).to be === nil
-      end
+    before :each do
+      @ver = '3.0'
+      @answers = answers.answers
+    end
 
-      it 'should add answers to the host objects' do
-        @ver = '3.0'
-        answers = subject.answers( hosts, master_certname, options )
-        hosts.each do |host|
-          expect( host[:answers] ).to be === answers[host.name]
-        end
-      end
+    it 'uses simple answers for upgrade from 3.0.x to 3.0.x' do
+      @upgrade_answers = upgrade_answers.answers
+      expect( @upgrade_answers ).to be === { "vm2"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm1"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm3"=>{ :q_install=>"y", :q_install_vendor_packages=>"y", :q_custom=>"LOOKLOOKLOOK" } }
     end
 
-    describe Version28 do
-      let( :options )     { Beaker::Options::Presets.presets }
-      let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-      let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
-                            basic_hosts[1]['platform'] = 'windows'
-                            basic_hosts }
-      let( :master_certname ) { 'master_certname' }
+    it 'sets correct answers for an agent' do
+      @ver = '3.0'
+      expect( @answers['vm3'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"n", :q_all_in_one_install=>"n", :q_puppet_enterpriseconsole_install=>"n", :q_puppetdb_install=>"n", :q_database_install=>"n", :q_custom=>"LOOKLOOKLOOK" }
+    end
 
-      it 'sets correct answers for an agent' do
-        @ver = '2.8'
-        expect( subject.answers( hosts, master_certname, options )['vm3'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
-      end
+    it 'sets correct answers for a master' do
+      @ver = '3.0'
+      expect( @answers['vm1'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"y", :q_all_in_one_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetdb_install=>"y", :q_database_install=>"y", :q_puppetdb_hostname=>hosts[0], :q_puppetdb_port=>8081, :q_puppetmaster_dnsaltnames=>"#{hosts[0]},#{hosts[0][:ip]},puppet", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_certname=>hosts[0], :q_puppetdb_database_name=>"pe-puppetdb", :q_puppetdb_database_user=>"mYpdBu3r", :q_puppetdb_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_database_host=>hosts[0], :q_database_port=>5432, :q_pe_database=>"y", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_database_root_password=>"'=ZYdjiP3jCwV5eo9s1MBd'", :q_database_root_user=>"pe-postgres" }
+    end
 
-      it 'sets correct answers for a master' do
-        @ver = '2.8'
-        expect( subject.answers( hosts, master_certname, options )['vm1'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>"master_certname", :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
-      end
+    it 'generates nil answers for a windows host' do
+      @ver = '3.0'
+      expect( @answers['vm2'] ).to be === nil
+    end
 
-      it 'generates nil answers for a windows host' do
-        @ver = '2.8'
-        expect( subject.answers( hosts, master_certname, options )['vm2'] ).to be === nil
+    it 'should add answers to the host objects' do
+      @ver = '3.0'
+      a = answers.answers
+      hosts.each do |host|
+        expect( host[:answers] ).to be === @answers[host.name]
       end
+    end
 
-      it 'should add answers to the host objects' do
-        @ver = '2.8'
-        answers = subject.answers( hosts, master_certname, options )
-        hosts.each do |host|
-          expect( host[:answers] ).to be === answers[host.name]
-        end
-      end
+    it 'appends custom answers to generated answers' do
+      expect( hosts[2][:custom_answers] ).to be == { :q_custom => 'LOOKLOOKLOOK' }
+      expect( @answers['vm3'] ).to include :q_custom
+      expect( hosts[2][:answers] ).to include :q_custom
+    end
+  end
+
+  describe Version28 do
+    let( :options )     { Beaker::Options::Presets.new.presets }
+    let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
+    let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
+                          basic_hosts[1]['platform'] = 'windows'
+                          basic_hosts }
+    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
 
+    before :each do
+      @ver = '2.8'
+      @answers = answers.answers
     end
-    describe Version20 do
-      let( :options )     { Beaker::Options::Presets.presets }
-      let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-      let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
-                            basic_hosts[1]['platform'] = 'windows'
-                            basic_hosts }
-      let( :master_certname ) { 'master_certname' }
 
-      it 'sets correct answers for an agent' do
-        @ver = '2.0'
-        expect( subject.answers( hosts, master_certname, options )['vm3'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
-      end
+    it 'sets correct answers for an agent' do
+      expect( @answers['vm3'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
+    end
 
-      it 'sets correct answers for a master' do
-        @ver = '2.0'
-        expect( subject.answers( hosts, master_certname, options )['vm1'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>"master_certname", :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_root_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
-      end
+    it 'sets correct answers for a master' do
+      expect( @answers['vm1'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>hosts[0], :q_puppetmaster_dnsaltnames=>"#{hosts[0]},#{hosts[0][:ip]},puppet", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
+    end
+
+    it 'generates nil answers for a windows host' do
+      expect( @answers['vm2'] ).to be === nil
+    end
 
-      it 'generates nil answers for a windows host' do
-        @ver = '2.0'
-        expect( subject.answers( hosts, master_certname, options )['vm2'] ).to be === nil
+    it 'should add answers to the host objects' do
+      hosts.each do |host|
+        expect( host[:answers] ).to be === @answers[host.name]
       end
+    end
+
+  end
+  describe Version20 do
+    let( :options )     { Beaker::Options::Presets.new.presets }
+    let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
+    let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
+                          basic_hosts[1]['platform'] = 'windows'
+                          basic_hosts }
+
+    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
+
+    before :each do
+      @ver = '2.0'
+      @answers = answers.answers
+    end
+
+    it 'sets correct answers for an agent' do
+      expect( @answers['vm3'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
+    end
+
+    it 'sets correct answers for a master' do
+      expect( @answers['vm1'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>hosts[0], :q_puppetmaster_dnsaltnames=>"#{hosts[0]},#{hosts[0][:ip]},puppet", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_root_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
+    end
+
+    it 'generates nil answers for a windows host' do
+      expect( @answers['vm2'] ).to be === nil
+    end
 
-      it 'should add answers to the host objects' do
-        @ver = '2.0'
-        answers = subject.answers( hosts, master_certname, options )
-        hosts.each do |host|
-          expect( host[:answers] ).to be === answers[host.name]
-        end
+    it 'should add answers to the host objects' do
+      hosts.each do |host|
+        expect( host[:answers] ).to be === @answers[host.name]
       end
     end
   end

data/spec/beaker/cli_spec.rb

@@ -19,7 +19,7 @@ module Beaker
         cli.stub(:validate).and_return(true)
         cli.stub(:provision).and_return(true)
       end
-     
+
       describe "test fail mode" do
         it 'continues testing after failed test if using slow fail_mode' do
           cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
@@ -47,7 +47,7 @@ module Beaker
 
         end
       end
- 
+
       describe "SUT preserve mode" do
         it 'cleans up SUTs post testing if tests fail and preserve_hosts = never' do
           cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
@@ -150,6 +150,39 @@ module Beaker
           expect{ cli.execute! }.to raise_error
 
         end
+
+        it 'cleans up SUTs post testing if tests fail and preserve_hosts = onpass' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_throw("bad test")
+          cli.stub(: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)
+
+          netmanager = double(:netmanager)
+          cli.instance_variable_set(:@network_manager, netmanager)
+          netmanager.should_receive(:cleanup).once
+
+          expect{ cli.execute! }.to raise_error
+
+        end
+
+        it 'preserves SUTs post testing if no tests fail and preserve_hosts = onpass' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_return(true)
+          cli.stub(: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)
+
+          netmanager = double(:netmanager)
+          cli.instance_variable_set(:@network_manager, netmanager)
+          netmanager.should_receive(:cleanup).never
+
+          expect{ cli.execute! }.to_not raise_error
+        end
       end
     end
   end

data/spec/beaker/dsl/install_utils_spec.rb

@@ -14,7 +14,8 @@ class ClassMixedWithDSLInstallUtils
 end
 
 describe ClassMixedWithDSLInstallUtils do
-  let(:opts)          { Beaker::Options::Presets.presets.merge(Beaker::Options::Presets.env_vars) }
+  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' ] } ) }
@@ -325,8 +326,6 @@ describe ClassMixedWithDSLInstallUtils do
       end
 
       subject.stub( :hosts ).and_return( hosts )
-      #determine mastercert
-      subject.should_receive( :on ).with( hosts[0], /uname/ ).once
       #create answers file per-host, except windows
       subject.should_receive( :create_remote_file ).with( hosts[0], /answers/, /q/ ).once
       #run installer on all hosts

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Beaker do
   let( :options )        { make_opts.merge({ 'logger' => double().as_null_object }) }
+  let( :ntpserver_set )  { "ntp_server_set" }
+  let( :options_ntp )    { make_opts.merge({ 'ntp_server' => ntpserver_set }) }
   let( :ntpserver )      { Beaker::HostPrebuiltSteps::NTPSERVER }
   let( :apt_cfg )        { Beaker::HostPrebuiltSteps::APT_CFG }
   let( :ips_pkg_repo )   { Beaker::HostPrebuiltSteps::IPS_PKG_REPO }
@@ -50,15 +52,6 @@ describe Beaker do
       expect{ subject.timesync( hosts, options ) }.to raise_error
     end
 
-    it "can sync time on solaris-10 hosts" do
-      hosts = make_hosts( { :platform => 'solaris-10' } )
-
-      Beaker::Command.should_receive( :new ).with("sleep 10 && ntpdate -w #{ntpserver}").exactly( 3 ).times
-
-      subject.timesync( hosts, options )
-
-    end
-
     it "can sync time on windows hosts" do
       hosts = make_hosts( { :platform => 'windows' } )
 
@@ -79,28 +72,57 @@ describe Beaker do
       subject.timesync( hosts, options )
 
     end
+
+    it "can set time server on unix hosts" do
+      hosts = make_hosts( { :platform => 'unix' } )
+
+      Beaker::Command.should_receive( :new ).with("ntpdate -t 20 #{ntpserver_set}").exactly( 3 ).times
+
+      subject.timesync( hosts, options_ntp )
+    end
+
+    it "can set time server on windows hosts" do
+      hosts = make_hosts( { :platform => 'windows' } )
+
+      Beaker::Command.should_receive( :new ).with("w32tm /register").exactly( 3 ).times
+      Beaker::Command.should_receive( :new ).with("net start w32time").exactly( 3 ).times
+      Beaker::Command.should_receive( :new ).with("w32tm /config /manualpeerlist:#{ntpserver_set} /syncfromflags:manual /update").exactly( 3 ).times
+      Beaker::Command.should_receive( :new ).with("w32tm /resync").exactly( 3 ).times
+
+      subject.timesync( hosts, options_ntp )
+
+    end
+
+    it "can set time server on Sles hosts" do
+      hosts = make_hosts( { :platform => 'sles-13.1-x64' } )
+
+      Beaker::Command.should_receive( :new ).with("sntp #{ntpserver_set}").exactly( 3 ).times
+
+      subject.timesync( hosts, options_ntp )
+
+    end
   end
 
   context "epel_info_for!" do
     subject { dummy_class.new }
-    
+
     it "can return the correct url for an el-6 host" do
-      host = make_host( 'testhost', { :platform => 'el-6-platform' } )
+      host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-6-platform') } )
 
-      expect( subject.epel_info_for!( host )).to be === "http://mirror.itc.virginia.edu/fedora-epel/6/i386/epel-release-6-8.noarch.rpm"
+      expect( subject.epel_info_for( host, options )).to be === ["http://mirrors.kernel.org/fedora-epel/6", "i386", "epel-release-6-8.noarch.rpm"]
     end
 
     it "can return the correct url for an el-5 host" do
-      host = make_host( 'testhost', { :platform => 'el-5-platform' } )
+      host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-5-platform') } )
 
-      expect( subject.epel_info_for!( host )).to be === "http://archive.linux.duke.edu/pub/epel/5/i386/epel-release-5-4.noarch.rpm"
+      expect( subject.epel_info_for( host, options )).to be === ["http://mirrors.kernel.org/fedora-epel/5", "i386", "epel-release-5-4.noarch.rpm"]
 
     end
 
     it "raises an error on non el-5/6 host" do
-      host = make_host( 'testhost', { :platform => 'el-4-platform' } )
+      host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-4-platform') } )
 
-      expect{ subject.epel_info_for!( host )}.to raise_error
+      expect{ subject.epel_info_for( host, options )}.to raise_error
 
     end
 
@@ -163,7 +185,7 @@ describe Beaker do
 
   context "proxy_config" do
     subject { dummy_class.new }
-    
+
     it "correctly configures ubuntu hosts" do
       hosts = make_hosts( { :platform => 'ubuntu', :exit_code => 1 } )
 
@@ -216,14 +238,15 @@ describe Beaker do
     subject { dummy_class.new }
 
     it "add extras for el-5/6 hosts" do
-      hosts = make_hosts( { :platform => 'el-5', :exit_code => 1 } )
-      hosts[0][:platform] = 'el-6' 
-      url = "http://el_extras_url"
-
-      subject.stub( :epel_info_for! ).and_return( url )
+      hosts = make_hosts( { :platform => Beaker::Platform.new('el-5-arch'), :exit_code => 1 } )
+      hosts[0][:platform] = Beaker::Platform.new('el-6-arch')
 
       Beaker::Command.should_receive( :new ).with("rpm -qa | grep epel-release").exactly( 3 ).times
-      Beaker::Command.should_receive( :new ).with("rpm -i #{url}").exactly( 3 ).times
+      Beaker::Command.should_receive( :new ).with("rpm -i http://mirrors.kernel.org/fedora-epel/6/i386/epel-release-6-8.noarch.rpm").exactly( 1 ).times
+      Beaker::Command.should_receive( :new ).with("rpm -i http://mirrors.kernel.org/fedora-epel/5/i386/epel-release-5-4.noarch.rpm").exactly( 2 ).times
+      Beaker::Command.should_receive( :new ).with("sed -i -e 's;#baseurl.*$;baseurl=http://mirrors\\.kernel\\.org/fedora\\-epel/6/$basearch;' /etc/yum.repos.d/epel.repo").exactly( 1 ).times
+      Beaker::Command.should_receive( :new ).with("sed -i -e 's;#baseurl.*$;baseurl=http://mirrors\\.kernel\\.org/fedora\\-epel/5/$basearch;' /etc/yum.repos.d/epel.repo").exactly( 2 ).times
+      Beaker::Command.should_receive( :new ).with("sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo").exactly( 3 ).times
       Beaker::Command.should_receive( :new ).with("yum clean all && yum makecache").exactly( 3 ).times
 
       subject.add_el_extras( hosts, options )
@@ -231,7 +254,7 @@ describe Beaker do
     end
 
     it "should do nothing for non el-5/6 hosts" do
-      hosts = make_hosts( { :platform => 'windows' } )
+      hosts = make_hosts( { :platform => Beaker::Platform.new('windows-version-arch') } )
 
       Beaker::Command.should_receive( :new ).never