beaker 2.13.0 → 2.14.0

data/lib/beaker/platform.rb

@@ -3,14 +3,18 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(freebsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus)\-.+\-.+$/
+    PLATFORMS = /^(cisco|freebsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus)\-.+\-.+$/
 
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
-      { :debian => { "wheezy"  => "7",
+      { :debian => { "jessie"  => "8",
+                     "wheezy"  => "7",
                      "squeeze" => "6",
                    },
-        :ubuntu => { "trusty"  => "1404",
+        :ubuntu => { "wily"    => "1510",
+                     "vivid"   => "1504",
+                     "utopic"  => "1410",
+                     "trusty"  => "1404",
                      "saucy"   => "1310",
                      "raring"  => "1304",
                      "quantal" => "1210",

data/lib/beaker/ssh_connection.rb

@@ -171,7 +171,7 @@ module Beaker
     def request_terminal_for channel, command
       channel.request_pty do |ch, success|
         if success
-          @logger.info "Allocated a PTY on #{@hostname} for #{command.inspect}"
+          @logger.debug "Allocated a PTY on #{@hostname} for #{command.inspect}"
         else
           abort "FAILED: could not allocate a pty when requested on " +
             "#{@hostname} for #{command.inspect}"

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.13.0'
+    STRING = '2.14.0'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -150,6 +150,7 @@ module Beaker
       @ver = '3.4'
       answers = @answers
       hosts.each do |host|
+        puts "checking #{host.name}"
         expect( host[:answers] ).to be === answers[host.name]
       end
     end
@@ -205,8 +206,9 @@ module Beaker
     end
 
     it 'should add answers to the host objects' do
+      answers = @answers
       hosts.each do |host|
-        expect( host[:answers] ).to be === @answers[host.name]
+        expect( host[:answers] ).to be === answers[host.name]
       end
     end
   end
@@ -266,7 +268,7 @@ module Beaker
 
     it ':q_update_server_host should default to the master' do
       hosts.each do |host|
-        expect( host[:answers][:q_update_server_host] ).to be == hosts[0]
+        expect( host[:answers][:q_update_server_host] ).to be == hosts[0].to_s
       end
     end
 
@@ -354,12 +356,12 @@ module Beaker
 
     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" }
+      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].to_s, :q_puppetagent_server=>hosts[0].to_s, :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 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" }
+      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].to_s, :q_puppetagent_server=>hosts[0].to_s, :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].to_s, :q_puppetdb_port=>8081, :q_puppetmaster_dnsaltnames=>"#{hosts[0].to_s},#{hosts[0][:ip]},puppet", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0].to_s, :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_certname=>hosts[0].to_s, :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].to_s, :q_database_port=>5432, :q_pe_database=>"y", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_certname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0].to_s, :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 'generates nil answers for a windows host' do
@@ -396,11 +398,11 @@ module Beaker
     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" }
+      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].to_s, :q_puppetagent_server=>hosts[0].to_s, :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_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'" }
+      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].to_s, :q_puppetagent_server=>hosts[0].to_s, :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>hosts[0].to_s, :q_puppetmaster_dnsaltnames=>"#{hosts[0].to_s},#{hosts[0][:ip]},puppet", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0].to_s, :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].to_s, :q_puppet_enterpriseconsole_inventory_certname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0].to_s, :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
@@ -429,11 +431,11 @@ module Beaker
     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" }
+      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].to_s, :q_puppetagent_server=>hosts[0].to_s, :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'" }
+      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].to_s, :q_puppetagent_server=>hosts[0].to_s, :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>hosts[0].to_s, :q_puppetmaster_dnsaltnames=>"#{hosts[0].to_s},#{hosts[0][:ip]},puppet", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0].to_s, :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].to_s, :q_puppet_enterpriseconsole_inventory_certname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0].to_s, :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
@@ -457,6 +459,9 @@ module Beaker
 
     def test_answer_customization(answer_key, value_to_set)
       @ver = '3.0'
+      if not options[:answers]
+        options[:answers] = {}
+      end
       options[:answers][answer_key] = value_to_set
       host_answers = answers.answers['vm1']
       expect( host_answers[answer_key] ).to be === value_to_set

data/spec/beaker/cli_spec.rb

@@ -203,8 +203,8 @@ module Beaker
           options[:hosts_file] = 'sample.cfg'
 
           hosts = [
-            { :hypervisor => 'peterPan' },
-            { :hypervisor => 'theMadHatter' },
+            make_host('petey', { :hypervisor => 'peterPan' }),
+            make_host('hatty', { :hypervisor => 'theMadHatter' }),
           ]
           cli.instance_variable_set(:@hosts, hosts)
 
@@ -303,7 +303,7 @@ module Beaker
               copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
 
               hosts = cli.instance_variable_get(:@hosts)
-              hosts << { :hypervisor => 'fusion' }
+              hosts << make_host('fusion', { :hypervisor => 'fusion' })
 
               reproducing_cmd = "the faith of the people"
               allow( cli ).to receive( :build_hosts_preserved_reproducing_command ).and_return( reproducing_cmd )
@@ -323,8 +323,8 @@ module Beaker
               copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
 
               hosts = cli.instance_variable_get(:@hosts)
-              hosts << { :hypervisor => 'fusion' }
-              hosts << { :hypervisor => 'docker' }
+              hosts << make_host('fusion', { :hypervisor => 'fusion' })
+              hosts << make_host('docker', { :hypervisor => 'docker' })
 
               reproducing_cmd = "the crow flies true says the shoe to you"
               allow( cli ).to receive( :build_hosts_preserved_reproducing_command ).and_return( reproducing_cmd )
@@ -345,7 +345,7 @@ module Beaker
               copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
 
               hosts = cli.instance_variable_get(:@hosts)
-              hosts << { :hypervisor => 'docker' }
+              hosts << make_host('docker', { :hypervisor => 'docker' })
 
               logger = cli.instance_variable_get(:@logger)
               expect( logger ).to receive( :send ).with( anything, "\nYou can re-run commands against the already provisioned SUT(s) with:\n").never

data/spec/beaker/command_spec.rb

@@ -23,6 +23,24 @@ module Beaker
 
     end
 
+    describe '#:prepend_cmds' do
+      it 'can prepend commands' do
+        @command = '/usr/bin/blah'
+        @args    = [ 'to', 'the', 'baz' ]
+        @options = { :foo => 'bar', :prepend_cmds => 'aloha!' }
+
+        expect( cmd.cmd_line({}) ).to be ==  "aloha! /usr/bin/blah --foo=bar to the baz"
+      end
+
+      it 'can handle no prepend_cmds' do
+        @command = '/usr/bin/blah'
+        @args    = [ 'to', 'the', 'baz' ]
+        @options = { :foo => 'bar', :prepend_cmds => nil }
+
+        expect( cmd.cmd_line({}) ).to be ==  "/usr/bin/blah --foo=bar to the baz"
+      end
+    end
+
     describe '#options_string' do
       it 'parses things' do
         subject.options = { :v => nil, :test => nil,

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

@@ -540,6 +540,7 @@ describe ClassMixedWithDSLHelpers do
 
       describe 'and command line args passed' do
         it 'modifies SUT trapperkeeper configuration w/ command line args' do
+          host['puppetserver-confdir'] = '/etc/puppetserver/conf.d'
           expect( subject ).to receive( :modify_tk_config).with(host, puppetserver_conf,
                                                           custom_puppetserver_opts)
           subject.with_puppet_running_on(host, conf_opts)
@@ -549,6 +550,7 @@ describe ClassMixedWithDSLHelpers do
       describe 'and no command line args passed' do
         let(:command_line_args) { nil }
         it 'modifies SUT trapperkeeper configuration w/ puppet defaults' do
+          host['puppetserver-confdir'] = '/etc/puppetserver/conf.d'
           expect( subject ).to receive( :modify_tk_config).with(host, puppetserver_conf,
                                                           default_puppetserver_opts)
           subject.with_puppet_running_on(host, conf_opts)

data/spec/beaker/dsl/install_utils/{puppet_utils_spec.rb → foss_utils_spec.rb}

@@ -133,6 +133,8 @@ describe ClassMixedWithDSLInstallUtils do
       logger = double.as_null_object
 
       allow( subject ).to receive( :metadata ).and_return( metadata )
+      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
+
       expect( subject ).to receive( :logger ).exactly( 3 ).times.and_return( logger )
       expect( subject ).to receive( :on ).exactly( 4 ).times
 
@@ -151,6 +153,7 @@ describe ClassMixedWithDSLInstallUtils do
       host   = { 'platform' => 'debian' }
       logger = double.as_null_object
       allow( subject ).to receive( :metadata ).and_return( metadata )
+      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
       expect( subject ).to receive( :logger ).exactly( 3 ).times.and_return( logger )
       expect( subject ).to receive( :on ).with( host,"test -d #{path} || mkdir -p #{path}").exactly( 1 ).times
       # this is the the command we want to test
@@ -172,6 +175,7 @@ describe ClassMixedWithDSLInstallUtils do
       path   = '/path/to/repos'
       cmd    = "test -d #{path}/#{repo[:name]} || git clone --branch #{repo[:depth_branch]} --depth #{repo[:depth]} #{repo[:path]} #{path}/#{repo[:name]}"
       host   = { 'platform' => 'debian' }
+      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
       logger = double.as_null_object
       allow( subject ).to receive( :metadata ).and_return( metadata )
       expect( subject ).to receive( :logger ).exactly( 3 ).times.and_return( logger )
@@ -192,65 +196,68 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     before do
+      allow( subject ).to receive(:options).and_return(opts)
       allow( subject ).to receive(:hosts).and_return(hosts)
       allow( subject ).to receive(:on).and_return(Beaker::Result.new({},''))
     end
     context 'on el-6' do
-      let(:platform) { "el-6-i386" }
+      let(:platform) { Beaker::Platform.new('el-6-i386') }
       it 'installs' do
         expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-el-6\.noarch\.rpm/)
-        expect(subject).to receive(:on).with(hosts[0], 'yum install -y puppet')
+        expect(hosts[0]).to receive(:install_package).with('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')
+        expect(hosts[0]).to receive(:install_package).with('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')
+        expect(hosts[0]).to receive(:install_package).with('puppet-3000')
+        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' )
       end
     end
     context 'on el-5' do
-      let(:platform) { "el-5-i386" }
+      let(:platform) { Beaker::Platform.new('el-5-i386') }
       it 'installs' do
         expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-el-5\.noarch\.rpm/)
-        expect(subject).to receive(:on).with(hosts[0], 'yum install -y puppet')
+        expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
     end
     context 'on fedora' do
-      let(:platform) { "fedora-18-x86_84" }
+      let(:platform) { Beaker::Platform.new('fedora-18-x86_84') }
       it 'installs' do
         expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-fedora-18\.noarch\.rpm/)
-        expect(subject).to receive(:on).with(hosts[0], 'yum install -y puppet')
+        expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
     end
     context 'on debian' do
-      let(:platform) { "debian-7-amd64" }
+      let(:platform) { Beaker::Platform.new('debian-7-amd64') }
       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')
+        hosts.each do |host|
+          expect(subject).to receive(:install_puppetlabs_release_repo).with(host)
+        end
+        expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
       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')
+        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' )
       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')
+        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' )
       end
     end
     context 'on windows' do
-      let(:platform) { "windows-2008r2-i386" }
+      let(:platform) { Beaker::Platform.new('windows-2008r2-i386') }
       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 )
@@ -268,7 +275,7 @@ describe ClassMixedWithDSLInstallUtils do
       end
     end
     describe 'on unsupported platforms' do
-      let(:platform) { 'solaris-11-x86_64' }
+      let(:platform) { Beaker::Platform.new('solaris-11-x86_64') }
       let(:host) { make_host('henry', :platform => 'solaris-11-x86_64') }
       let(:hosts) { [host] }
       it 'by default raises an error' do
@@ -351,6 +358,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     before do
       allow(subject).to receive(:options) { opts }
+      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
     end
 
     describe "When host is unsupported platform" do
@@ -396,6 +404,7 @@ describe ClassMixedWithDSLInstallUtils do
     let( :logger_double ) do
       logger_double = Object.new
       allow(logger_double).to receive(:debug)
+      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
       subject.instance_variable_set(:@logger, logger_double)
       logger_double
     end
@@ -519,6 +528,10 @@ describe ClassMixedWithDSLInstallUtils do
       FakeHost.create('fakvm', platform, opts)
     end
 
+    before :each do
+      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
+    end
+
     it 'sets the find command correctly for el-based systems' do
       @platform = 'el-1-3'
       expect( subject ).to receive( :on ).with( host, /\*\.rpm.+rpm\s-ivh/ )

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

@@ -8,6 +8,8 @@ class ClassMixedWithDSLInstallUtils
   include Beaker::DSL::Roles
   include Beaker::DSL::Patterns
 
+  attr_accessor :hosts
+
   def logger
     @logger ||= RSpec::Mocks::Double.new('logger').as_null_object
   end

data/spec/beaker/dsl/structure_spec.rb

@@ -128,6 +128,14 @@ describe ClassMixedWithDSLStructure do
       subject.confine( :to, {} )
     end
 
+    it 'uses a provided host subset when no criteria is provided' do
+
+      subset = ['host1', 'host2']
+      hosts = subset.dup << 'host3'
+      expect( subject ).to receive( :hosts= ).with( subset )
+      subject.confine :to, {}, subset
+    end
+
     it 'raises when given mode is not :to or :except' do
       allow( subject ).to receive( :hosts )
       allow( subject ).to receive( :hosts= )

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

@@ -17,6 +17,11 @@ module Beaker
       def to_s
         "me"
       end
+
+      def exec
+        #noop
+      end
+
     end
 
     let (:opts)     { @opts || {} }
@@ -28,7 +33,7 @@ module Beaker
       it "checks correctly on sles" do
         @opts = {'platform' => 'sles-is-me'}
         pkg = 'sles_package'
-        expect( Beaker::Command ).to receive(:new).with("zypper se -i --match-exact #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("zypper se -i --match-exact #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
@@ -36,7 +41,7 @@ module Beaker
       it "checks correctly on fedora" do
         @opts = {'platform' => 'fedora-is-me'}
         pkg = 'fedora_package'
-        expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
@@ -44,7 +49,7 @@ module Beaker
       it "checks correctly on centos" do
         @opts = {'platform' => 'centos-is-me'}
         pkg = 'centos_package'
-        expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
@@ -52,7 +57,7 @@ module Beaker
       it "checks correctly on EOS" do
         @opts = {'platform' => 'eos-is-me'}
         pkg = 'eos-package'
-        expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
@@ -60,7 +65,7 @@ module Beaker
       it "checks correctly on el-" do
         @opts = {'platform' => 'el-is-me'}
         pkg = 'el_package'
-        expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
@@ -68,7 +73,7 @@ module Beaker
       it "checks correctly on debian" do
         @opts = {'platform' => 'debian-is-me'}
         pkg = 'debian_package'
-        expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
@@ -76,7 +81,7 @@ module Beaker
       it "checks correctly on ubuntu" do
         @opts = {'platform' => 'ubuntu-is-me'}
         pkg = 'ubuntu_package'
-        expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
@@ -84,7 +89,7 @@ module Beaker
       it "checks correctly on cumulus" do
         @opts = {'platform' => 'cumulus-is-me'}
         pkg = 'cumulus_package'
-        expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
@@ -92,7 +97,7 @@ module Beaker
       it "checks correctly on solaris-11" do
         @opts = {'platform' => 'solaris-11-is-me'}
         pkg = 'solaris-11_package'
-        expect( Beaker::Command ).to receive(:new).with("pkg info #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("pkg info #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
@@ -100,7 +105,7 @@ module Beaker
       it "checks correctly on solaris-10" do
         @opts = {'platform' => 'solaris-10-is-me'}
         pkg = 'solaris-10_package'
-        expect( Beaker::Command ).to receive(:new).with("pkginfo #{pkg}").and_return('')
+        expect( Beaker::Command ).to receive(:new).with("pkginfo #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end