beaker 2.30.1 → 2.31.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmI0MWU4ZDExZjIzYjg0OGExZDg5Mzk3NTI0ZWM2MTM1MmM4YTZkMA==
+    YTVhYzY3M2U5ZTcxZWY2MzU4MjExNmZjMjZkMGUwZDQ3ZGI5OGIyNA==
   data.tar.gz: !binary |-
-    ZGRlY2RhZDJkNTkxYmM0NGM0MTM1NTBmZWQ1OWU1MDJjNDU2NjdjMQ==
+    NzFlNDFlZjk3NGE0MTNiMTcxYWVmNzY1YWNkYTc3YjQ2MTM1OGM2MQ==
 SHA512:
   metadata.gz: !binary |-
-    MWE2ODkwNWNkNWZkMDlmMGE1ZTg2N2M2ZmEzNmFlYWExMzE2ZmMwY2EyNjBm
-    MmE4ZjFkNmZkZDg3MjYxNjg0Y2JhMzE4Y2Y2YmE2ZmU1NTQ3ZjJhMjA2NjYx
-    ZmI3YjM2MGZiNGY1NmYwZjE4NTBiYjlhYmUyYjI0ODliM2VmZDg=
+    ZGFmOGI0Yjc3MzViMDE0MGU3ODBjZDA4ZDNmM2ExZDQ1NDZmODA2NWEwNDk3
+    N2YyYjM1NmNmNTY1Y2RjN2E3ZjU5ZDQ0ODVkYjJlYTBhMmU4M2JhMmRlMDBj
+    MzU3MGZiYzJiOTIzNGJiYTIxZTZjYzgxOWViY2E2NTUyOGJhYjU=
   data.tar.gz: !binary |-
-    M2NjZDI3MTVlMGZkZGNlYThlYWRmMTcwODlkNjhkMzJhYjAxNDIyMmNiYTFh
-    NGM4YWRmNTcwNTNjYjAzZmMzYWMxMWJjYzU3YWQ5YjdlNTFiYTVhYjc2NzU5
-    YzViMjAyNDcyOTQ2NTIxMWMzYTQ1YzFmNTgzMjRhMWFhYzgyMjA=
+    NGZhNDUwMmIxZjhiOWIxNTkzOTAyMzA2MGZmZGQyOGI2ZDJjZjBhMDc4NmUw
+    YjAwMGE3ZDc3ZmJmYzE1MmVmODY1YTEwOTJlYjg5ZGNmYWE4ZGNiYTI1M2U4
+    Zjk2ODhlZTRlZDgzN2E5MDg3ODhkYzBlNjgxM2MwZTZhNGI0NDE=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 3 Dec, 2015 (a1ee5206)](#LATEST)
+* [LATEST - 16 Dec, 2015 (da1729b0)](#LATEST)
+* [2.30.1 - 3 Dec, 2015 (9f1376ef)](#2.30.1)
 * [2.30.0 - 2 Dec, 2015 (dbb72630)](#2.30.0)
 * [2.29.1 - 23 Nov, 2015 (5d824690)](#2.29.1)
 * [2.29.0 - 18 Nov, 2015 (33fd2399)](#2.29.0)
@@ -104,7 +105,193 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 3 Dec, 2015 (a1ee5206)
+### <a name = "LATEST">LATEST - 16 Dec, 2015 (da1729b0)
+
+* (GEM) update beaker version to 2.31.0 (da1729b0)
+
+* Revert "Added netscaler platform" (112ef320)
+
+
+```
+Revert "Added netscaler platform"
+
+This reverts commit 6a2abd36fe5b36db163582b12dca11b5cd018c7f.
+```
+* Added netscaler platform (6a2abd36)
+
+* Merge pull request #1034 from erikPrime/(BKR-237)_disable_updates.puppetlabs.com (23bc8f94)
+
+
+```
+Merge pull request #1034 from erikPrime/(BKR-237)_disable_updates.puppetlabs.com
+
+(BKR-237) disable updates.puppetlabs.com
+```
+* (BKR-237) fixed option & updated tests (85a99ef8)
+
+* Merge pull request #1033 from kevpl/bkr647_windows_pkgcygwin (e0d06f7f)
+
+
+```
+Merge pull request #1033 from kevpl/bkr647_windows_pkgcygwin
+
+(BKR-647) windows.install_package now uses SSL cygwin URL with fallback
+```
+* (BKR-237) mods in response to review (af321acf)
+
+* (MAINT) fix spec test for set_etc_hosts (cf6dc589)
+
+* (MAINT) makes set_etc_hosts APPEND instead of REPLACE (09cbdf77)
+
+* (BKR-237) updates.puppetlabs.com resolves to 127.0.0.1 (a78ee042)
+
+* Merge pull request #1031 from kevpl/bkr642_aix_fix (ab4ebd1d)
+
+
+```
+Merge pull request #1031 from kevpl/bkr642_aix_fix
+
+(BKR-642) include aix exec, error checking to unix exec
+```
+* Merge pull request #1032 from kevpl/bkr628_mac_group (2c79ac19)
+
+
+```
+Merge pull request #1032 from kevpl/bkr628_mac_group
+
+(BKR-628) fixed mac group_present check
+```
+* (BKR-647) windows.install_package now uses SSL cygwin URL with fallback (95bf615b)
+
+* Merge pull request #1025 from ody/add_privatebindir_to_path (6e7333f5)
+
+
+```
+Merge pull request #1025 from ody/add_privatebindir_to_path
+
+Add privatebindir to PATH
+```
+* (BKR-628) fixed mac group_present check (35b12e53)
+
+* Merge pull request #1029 from kevpl/bkr569_fetch_nocache (3ffd8b42)
+
+
+```
+Merge pull request #1029 from kevpl/bkr569_fetch_nocache
+
+(BKR-569) added caching disable option
+```
+* (BKR-642) include aix exec, error checking to unix exec (7ba2bf64)
+
+* Merge pull request #1026 from ody/reorder_permiteuserenv (77581a29)
+
+
+```
+Merge pull request #1026 from ody/reorder_permiteuserenv
+
+Swap the placement of PermiteUserEnvironment
+```
+* Merge pull request #1030 from kevpl/bkr626_puppetagent_docs (7173bd15)
+
+
+```
+Merge pull request #1030 from kevpl/bkr626_puppetagent_docs
+
+(BKR-626) added puppet-agent doc links
+```
+* Merge pull request #1018 from sathlan/feature/add_memory_option_to_vagrant_libvirt (91621239)
+
+
+```
+Merge pull request #1018 from sathlan/feature/add_memory_option_to_vagrant_libvirt
+
+(BKR-631) Add memory option to vagrant libvirt.
+```
+* (BKR-626) added puppet-agent doc links (dee654e4)
+
+* (BKR-569) added caching disable option (1cf628e4)
+
+* Merge pull request #1028 from joshcooper/ticket/master/BKR-644-fedora-puppet-agent-dev-repo (a6e41cc1)
+
+
+```
+Merge pull request #1028 from joshcooper/ticket/master/BKR-644-fedora-puppet-agent-dev-repo
+
+(BKR-644) Prepend 'f' to the fedora version
+```
+* Merge pull request #1027 from bmjen/fix-solaris (3df53898)
+
+
+```
+Merge pull request #1027 from bmjen/fix-solaris
+
+(maint) Fix typo in solaris install_pe util function.
+```
+* (BKR-644) Prepend 'f' to the fedora version (1b15425d)
+
+
+```
+(BKR-644) Prepend 'f' to the fedora version
+
+Previously, install_puppet_agent_dev_repo_on did not work for fedora,
+because we were constructing a URL of the form:
+
+    http://<host>/puppet-agent/<sha>/repos/fedora/22/PC1/x86_64/puppet-agent-1.3.2-1.fedora22.x86_64.rpm
+
+However, we unfortunately prepend 'f' to the version string when
+publishing the package, see RE-4191.
+
+This commit prepends an 'f' to the version string for fedora-only, so
+the new URL is:
+
+    http://<host>/puppet-agent/<sha>/repos/fedora/f22/PC1/x86_64/puppet-agent-1.3.2-1.fedoraf22.x86_64.rpm
+
+Note f22 appears in two places, "fedora/f22" and
+"puppet-agent...-fedoraf22.x86_64.rpm"
+```
+* (maint) Fix typo in solaris install_pe util function. (3e68260a)
+
+* (MAINT) Swap placement of PermitUserEnvironment (2cb7f6d6)
+
+
+```
+(MAINT) Swap placement of PermitUserEnvironment
+
+  This commit will rework the way PermiteUserEnvironment is added to
+  sshd_config by putting it at the top of the file.
+
+  Without this commit you will create a bad sshd_config if your sut's
+  base image containes matching blocks the end of its sshd_config
+  because the PermitUserEnvironment option is not allowed there.  This
+  ordering is likely perferred since it is generally the norm to put
+  matching blocks at the end of the sshd_config.
+```
+* (MAINT) Add privatebindir to PATH (5e45c1f1)
+
+
+```
+(MAINT) Add privatebindir to PATH
+
+  This commit will add privatebindir to the list of paths added to the
+  PATH variable stored in ~/.ssh/environment.
+
+  This needs to happen so that the gem command and any excutables
+  installed using that gem command are available for use during a suite.
+  A requirement if your suite deploys dependencies with r10k on both aio
+  and foss agent types.
+```
+* (BKR-631) Add memory option to vagrant libvirt. (349501e0)
+
+
+```
+(BKR-631) Add memory option to vagrant libvirt.
+
+This add the possibility to specify the memory for each host separately
+or for every host.
+```
+### <a name = "2.30.1">2.30.1 - 3 Dec, 2015 (9f1376ef)
+
+* (HISTORY) update beaker history for gem release 2.30.1 (9f1376ef)
 
 * (GEM) update beaker version to 2.30.1 (a1ee5206)
 

data/lib/beaker/dsl/helpers/web_helpers.rb

@@ -47,7 +47,7 @@ module Beaker
           base_url.chomp!('/')
           src = "#{base_url}/#{file_name}"
           dst = File.join(dst_dir, file_name)
-          if File.exists?(dst)
+          if options[:cache_files_locally] && File.exists?(dst)
             logger.notify "Already fetched #{dst}"
           else
             logger.notify "Fetching: #{src}"

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -1112,6 +1112,7 @@ module Beaker
               release_path << release_path_end
             when /^(fedora|el|centos|sles)$/
               variant = ((variant == 'centos') ? 'el' : variant)
+              version = ((variant == 'fedora') ? "f#{version}" : version)
               release_path << "#{variant}/#{version}/#{opts[:puppet_collection]}/#{arch}"
               release_file = "puppet-agent-#{opts[:puppet_agent_version]}-1.#{variant}#{version}.#{arch}.rpm"
             when /^(aix)$/
@@ -1343,7 +1344,7 @@ NOASK
                 arch = 'i386'
               end
               release_file = "/repos/solaris/#{version}/#{opts[:puppet_collection]}/puppet-agent-*#{arch}.pkg.gz"
-              download_file = "puppet-agent-#{varant}-#{version}-#{arch}.tar.gz"
+              download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
             else
               raise "No pe-promoted installation step for #{variant} yet..."
             end

data/lib/beaker/dsl/install_utils/pe_utils.rb

@@ -327,6 +327,9 @@ module Beaker
         # @note on windows, the +:ruby_arch+ host parameter can determine in addition
         # to other settings whether the 32 or 64bit install is used
         #
+        # @note for puppet-agent install options, refer to
+        #   {Beaker::DSL::InstallUtils::FOSSUtils#install_puppet_agent_pe_promoted_repo_on}
+        #
         # @api private
         #
         def do_install hosts, opts = {}
@@ -548,6 +551,9 @@ module Beaker
         #       Install file names are assumed to be of the format puppet-enterprise-VERSION-PLATFORM.(tar)|(tar.gz)
         #       for Unix like systems and puppet-enterprise-VERSION.msi for Windows systems.
         #
+        # @note For further installation parameters (such as puppet-agent install)
+        #   options, refer to {#do_install} documentation
+        #
         def install_pe_on(install_hosts, opts)
           confine_block(:to, {}, install_hosts) do
             sorted_hosts.each do |host|

data/lib/beaker/dsl/install_utils/puppet_utils.rb

@@ -35,7 +35,7 @@ module Beaker
         #Given a host construct a PATH that includes puppetbindir, facterbindir and hierabindir
         # @param [Host] host    A single host to construct pathing for
         def construct_puppet_path(host)
-          path = (%w(puppetbindir facterbindir hierabindir)).compact.reject(&:empty?)
+          path = (%w(puppetbindir privatebindir facterbindir hierabindir)).compact.reject(&:empty?)
           #get the PATH defaults
           path.map! { |val| host[val] }
           path = path.compact.reject(&:empty?)

data/lib/beaker/host.rb

@@ -3,6 +3,9 @@ require 'timeout'
 require 'benchmark'
 require 'rsync'
 
+require 'beaker/dsl/helpers'
+require 'beaker/dsl/patterns'
+
 [ 'command', 'ssh_connection'].each do |lib|
   require "beaker/#{lib}"
 end
@@ -11,6 +14,9 @@ module Beaker
   class Host
     SELECT_TIMEOUT = 30
 
+    include Beaker::DSL::Helpers
+    include Beaker::DSL::Patterns
+
     class CommandFailure < StandardError; end
 
     # This class provides array syntax for using puppet --configprint on a host

data/lib/beaker/host/aix.rb

@@ -4,13 +4,14 @@ end
 
 module Aix
   class Host < Unix::Host
-    [ 'user', 'group', 'file' ].each do |lib|
+    [ 'user', 'group', 'file', 'exec' ].each do |lib|
         require "beaker/host/aix/#{lib}"
     end
 
     include Aix::User
     include Aix::Group
     include Aix::File
+    include Aix::Exec
 
   end
 end

data/lib/beaker/host/mac/group.rb

@@ -66,7 +66,7 @@ module Mac::Group
   # @param [Proc] block Additional actions or insertions
   def group_present(name, &block)
     group_exists = false
-    execute("dscacheutil -q user -a name #{name}") do |result|
+    execute("dscacheutil -q group -a name #{name}") do |result|
       group_exists = result.stdout =~  /^name: #{name}/
     end
 

data/lib/beaker/host/unix/exec.rb

@@ -176,6 +176,8 @@ module Unix::Exec
       exec(Beaker::Command.new("svcadm restart svc:/network/ssh:default"))
     when /(free|open)bsd/
       exec(Beaker::Command.new("sudo /etc/rc.d/sshd restart"))
+    else
+      raise ArgumentError, "Unsupported Platform: '#{self['platform']}'"
     end
   end
 
@@ -187,19 +189,31 @@ module Unix::Exec
   def ssh_permit_user_environment
     case self['platform']
     when /debian|ubuntu|cumulus/
-      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+      directory = create_tmpdir_on(self)
+      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
+      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
     when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7/
-      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+      directory = create_tmpdir_on(self)
+      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
+      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
     when /el-|centos|fedora|redhat|oracle|scientific|eos/
-      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+      directory = create_tmpdir_on(self)
+      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
+      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
     when /sles/
-      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+      directory = create_tmpdir_on(self)
+      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
+      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
     when /solaris/
       # kept solaris here because refactoring it into its own Host module
       # conflicts with the solaris hypervisor that already exists
-      exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+      directory = create_tmpdir_on(self)
+      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
+      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
     when /(free|open)bsd/
       exec(Beaker::Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), {:pty => true} )
+    else
+      raise ArgumentError, "Unsupported Platform: '#{self['platform']}'"
     end
 
     ssh_service_restart()

data/lib/beaker/host/windows/pkg.rb

@@ -26,7 +26,13 @@ module Windows::Pkg
     end
 
     if not check_for_command(cygwin)
-      execute("curl --retry 5 http://cygwin.com/#{cygwin} -o /cygdrive/c/Windows/System32/#{cygwin}")
+      command = "curl --retry 5 https://cygwin.com/#{cygwin} -o /cygdrive/c/Windows/System32/#{cygwin}"
+      begin
+        execute(command)
+      rescue Beaker::Host::CommandFailure
+        command.sub!('https', 'http')
+        execute(command)
+      end
     end
     execute("#{cygwin} -q -n -N -d -R #{cmdline_args} #{rootdir} -s http://cygwin.osuosl.org -P #{name}")
   end

data/lib/beaker/host_prebuilt_steps.rb

@@ -323,7 +323,7 @@ module Beaker
       if host['platform'] =~ /freebsd/
         host.echo_to_file(etc_hosts, '/etc/hosts')
       else
-        host.exec(Command.new("echo '#{etc_hosts}' > /etc/hosts"))
+        host.exec(Command.new("echo '#{etc_hosts}' >> /etc/hosts"))
       end
     end
 
@@ -377,6 +377,17 @@ module Beaker
       end
     end
 
+    # Update /etc/hosts to make updates.puppetlabs.com (aka the dujour server) resolve to 127.0.01,
+    # so that we don't pollute the server with test data.  See SERVER-1000, BKR-182, BKR-237, DJ-10
+    # for additional details.
+    def disable_updates hosts, opts
+      logger = opts[:logger]
+      hosts.each do |host|
+        logger.notify "Disabling updates.puppetlabs.com by modifying hosts file to resolve updates to 127.0.0.1 on #{host}"
+        set_etc_hosts(host, "127.0.0.1\tupdates.puppetlabs.com\n")
+      end
+    end 
+
     # Update sshd_config on debian, ubuntu, centos, el, redhat, cumulus, and fedora boxes to allow for root login
     #
     # Does nothing on other platfoms.

data/lib/beaker/hypervisor.rb

@@ -118,6 +118,9 @@ module Beaker
       if @options[:set_env]
         set_env(@hosts, @options)
       end
+      if @options[:disable_updates]
+        disable_updates(@hosts, @options)
+      end
     end
 
     #Default validation steps to be run for a given hypervisor.  Ensures that SUTs meet requirements to be

data/lib/beaker/hypervisor/vagrant_libvirt.rb

@@ -1,11 +1,31 @@
 require 'beaker/hypervisor/vagrant'
 
 class Beaker::VagrantLibvirt < Beaker::Vagrant
+  @memory = nil
+
+  class << self
+    attr_reader :memory
+  end
+
   def provision(provider = 'libvirt')
     super
   end
 
   def self.provider_vfile_section(host, options)
-    "    v.vm.provider :libvirt"
+    "    v.vm.provider :libvirt do |node|\n" +
+      "      node.memory = #{memory(host, options)}\n" +
+      "    end\n"
+  end
+
+  def self.memory(host, options)
+    return @memory unless @memory.nil?
+    @memory = case
+    when host['vagrant_memsize']
+      host['vagrant_memsize']
+    when options['vagrant_memsize']
+      options['vagrant_memsize']
+    else
+      '512'
+    end
   end
 end

data/lib/beaker/options/presets.rb

@@ -161,6 +161,7 @@ module Beaker
           :timesync               => false,
           :disable_iptables       => false,
           :set_env                => true,
+          :disable_updates        => true,
           :repo_proxy             => false,
           :package_proxy          => false,
           :add_el_extras          => false,
@@ -185,6 +186,7 @@ module Beaker
           :puppetdb_port_nonssl   => 8080,
           :puppetserver_port      => 8140,
           :nodeclassifier_port    => 4433,
+          :cache_files_locally    => true, # TODO change to false in next major version
           :aws_keyname_modifier   => rand(10 ** 10).to_s.rjust(10,'0'), # 10 digit random number string
           :ssh                    => {
                                      :config                => false,

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.30.1'
+    STRING = '2.31.0'
   end
 end

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

@@ -13,13 +13,19 @@ class ClassMixedWithDSLHelpers
 end
 
 describe ClassMixedWithDSLHelpers do
+  let( :logger  ) { double("Beaker::Logger", :notify => nil , :debug => nil ) }
+  let( :url     ) { "http://beaker.tool" }
+  let( :name    ) { "name" }
+  let( :destdir ) { "destdir" }
 
   def fetch_allows
-    allow(subject).to receive( :logger ) { logger }
+    allow( subject ).to receive( :logger )  { logger }
+    allow( subject ).to receive( :options ) { options }
   end
 
   describe "#fetch_http_file" do
-    let( :logger) { double("Beaker::Logger", :notify => nil , :debug => nil ) }
+    let( :presets ) { Beaker::Options::Presets.new }
+    let( :options ) { presets.presets.merge(presets.env_vars) }
 
     before do
       fetch_allows
@@ -28,9 +34,21 @@ describe ClassMixedWithDSLHelpers do
     describe "given valid arguments" do
 
       it "returns its second and third arguments concatenated." do
-        create_files(['destdir/name'])
-        result = subject.fetch_http_file "http://beaker.tool", "name", "destdir"
-        expect(result).to eq("destdir/name")
+        concat_path = "#{destdir}/#{name}"
+        create_files([concat_path])
+        expect( logger ).to receive( :notify ).with( /^Already\ fetched\ / )
+        result = subject.fetch_http_file url, name, destdir
+        expect(result).to eq(concat_path)
+      end
+
+      it 'doesn\'t cache if :cache_files_locally set false' do
+        options[:cache_files_locally] = false
+
+        expect( logger ).to receive( :notify ).with( /^Fetching/ ).ordered
+        expect( logger ).to receive( :notify ).with( /^\ \ and\ saving\ to\ / ).ordered
+        expect( subject ).to receive( :open )
+
+        subject.fetch_http_file( url, name, destdir )
       end
 
     end
@@ -38,8 +56,8 @@ describe ClassMixedWithDSLHelpers do
     describe 'given invalid arguments' do
 
       it 'chomps correctly when given a URL ending with a / character' do
-        expect( subject ).to receive( :open ).with( 'http://beaker.tool/name', anything )
-        subject.fetch_http_file( "http://beaker.tool/", "name", "destdir" )
+        expect( subject ).to receive( :open ).with( "#{url}/#{name}", anything )
+        subject.fetch_http_file( url, name, destdir )
       end
 
     end
@@ -59,8 +77,8 @@ describe ClassMixedWithDSLHelpers do
       it "returns basename of first argument concatenated to second." do
         expect(subject).to receive(:`).with(/^wget.*/).ordered { result }
         expect($?).to receive(:to_i).and_return(0)
-        result = subject.fetch_http_dir "http://beaker.tool/beep", "destdir"
-        expect(result).to eq("destdir/beep")
+        result = subject.fetch_http_dir "#{url}/beep", destdir
+        expect(result).to eq("#{destdir}/beep")
       end
 
     end

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

@@ -882,6 +882,21 @@ describe ClassMixedWithDSLInstallUtils do
       subject.install_puppet_agent_dev_repo_on( host, opts )
     end
 
+    it 'prepends f to the version in the URL and rpm' do
+      platform = Object.new()
+      allow(platform).to receive(:to_array) { ['fedora', '22', 'x4']}
+      host = basic_hosts.first
+      host['platform'] = platform
+      opts = { :version => '0.1.0' }
+      allow( subject ).to receive( :options ).and_return( {} )
+
+      expect(subject).to receive(:fetch_http_file).once.with(/\/fedora\/f22\//, /-agent-0.1.0-1.fedoraf22/, /fedora/)
+      expect(subject).to receive(:scp_to).once.with(host, /puppet-agent-0.1.0-1.fedoraf22.x4.rpm/, "/root")
+      expect(subject).to receive(:on).ordered.with(host, /rpm -ivh/)
+
+      subject.install_puppet_agent_dev_repo_on( host, opts )
+    end
+
     it 'runs the correct install for windows platforms' do
       platform = Object.new()
       allow(platform).to receive(:to_array) { ['windows', '5', 'x64']}

data/spec/beaker/host/aix_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+module Aix
+  describe Host do
+    let(:options)  { @options ? @options : {} }
+    let(:platform) {
+      if @platform
+        { :platform => Beaker::Platform.new( @platform) }
+      else
+        { :platform => Beaker::Platform.new( 'aix-vers-arch-extra' ) }
+      end
+    }
+    let(:host)    { make_host( 'name', options.merge(platform) ) }
+
+    describe '#ssh_service_restart' do
+      it 'invokes the correct commands on the host' do
+        expect( Beaker::Command ).to receive( :new ).with( 'stopsrc -g ssh'  ).once.ordered
+        expect( Beaker::Command ).to receive( :new ).with( 'startsrc -g ssh' ).once.ordered
+        host.ssh_service_restart
+      end
+    end
+
+    describe '#ssh_permit_user_environment' do
+      it 'calls echo to set PermitUserEnvironment' do
+        expect( Beaker::Command ).to receive( :new ).with( /^echo\ / ).once.ordered
+        allow( host ).to receive( :ssh_service_restart )
+        host.ssh_permit_user_environment
+      end
+
+      it 'uses the correct ssh config file' do
+        expect( Beaker::Command ).to receive( :new ).with( /#{Regexp.escape(' >> /etc/ssh/sshd_config')}$/ ).once
+        allow( host ).to receive( :ssh_service_restart )
+        host.ssh_permit_user_environment
+      end
+    end
+
+    describe '#reboot' do
+      it 'invokes the correct command on the host' do
+        expect( Beaker::Command ).to receive( :new ).with( 'shutdown -Fr' ).once
+        host.reboot
+      end
+    end
+
+    describe '#get_ip' do
+      it 'invokes the correct command on the host' do
+        expect( host ).to receive( :execute ).with( /^ifconfig\ \-a\ inet\|\ / ).once.and_return( '' )
+        host.get_ip
+      end
+    end
+  end
+end

data/spec/beaker/host/mac/group_spec.rb

@@ -86,6 +86,7 @@ EOS
     it 'returns group existence without running create command if it already exists' do
       result.stdout = puppet1
       expect( subject ).to receive( :execute ).once.and_yield(result)
+      expect( subject ).not_to receive( :gid_next )
       subject.group_present( 'puppet1' )
     end
 
@@ -100,6 +101,15 @@ EOS
       subject.group_present( name )
     end
 
+    it 'makes the correct call to dscacheutil' do
+      result.stdout = puppet1
+      expect( subject ).to receive( :execute ).with(
+        /^dscacheutil\ \-q\ group\ \-a\ name\ /
+      ).once.and_yield(result)
+      expect( subject ).not_to receive( :gid_next )
+      subject.group_present( 'puppet1' )
+    end
+
   end
 
   describe '#group_absent' do

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

@@ -49,5 +49,23 @@ module Beaker
          expect( instance.mv(origin, destination, false) ).to be === 0
       end
     end
+
+    describe '#ssh_permit_user_environment' do
+      it 'raises an error on unsupported platforms' do
+        opts['platform'] = 'notarealthing01-parts-arch'
+        expect {
+          instance.ssh_permit_user_environment
+        }.to raise_error( ArgumentError, /#{opts['platform']}/ )
+      end
+    end
+
+    describe '#ssh_service_restart' do
+      it 'raises an error on unsupported platforms' do
+        opts['platform'] = 'notarealthing02-parts-arch'
+        expect {
+          instance.ssh_service_restart
+        }.to raise_error( ArgumentError, /#{opts['platform']}/ )
+      end
+    end
   end
 end

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

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+module Beaker
+  describe Windows::Pkg do
+    class WindowsPkgTest
+      include Windows::Pkg
+
+      def initialize(hash, logger)
+        @hash = hash
+        @logger = logger
+      end
+
+      def [](k)
+        @hash[k]
+      end
+
+      def to_s
+        "me"
+      end
+
+      def exec
+        #noop
+      end
+
+    end
+
+    let (:opts)     { @opts || {} }
+    let (:logger)   { double( 'logger' ).as_null_object }
+    let (:instance) { WindowsPkgTest.new(opts, logger) }
+
+    describe '#install_package' do
+      before :each do
+        allow( instance ).to receive( :identify_windows_architecture )
+      end
+
+      context 'cygwin does not exist' do
+        before :each do
+          allow( instance ).to receive( :check_for_command ).and_return( false )
+        end
+
+        it 'curls the SSL URL for cygwin\'s installer' do
+          expect( instance ).to receive( :execute ).with( /^curl.*https\:/  ).ordered
+          allow(  instance ).to receive( :execute ).with( /^setup\-x86/     ).ordered
+          instance.install_package( 'curl' )
+        end
+
+        it 'falls back to the non-SSL URL if that one fails' do
+          allow(  instance ).to receive( :execute ).with( /^curl.*https\:/  ).and_raise( Beaker::Host::CommandFailure ).ordered
+          expect( instance ).to receive( :execute ).with( /^curl.*http\:/   ).ordered
+          allow(  instance ).to receive( :execute ).with( /^setup\-x86/     ).ordered
+          instance.install_package( 'curl' )
+        end
+      end
+    end
+
+  end
+end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -456,7 +456,7 @@ describe Beaker do
       host = make_host('name', {})
       etc_hosts = "127.0.0.1  localhost\n192.168.2.130 pe-ubuntu-lucid\n192.168.2.128 pe-centos6\n192.168.2.131 pe-debian6"
 
-      expect( Beaker::Command ).to receive( :new ).with( "echo '#{etc_hosts}' > /etc/hosts" ).once
+      expect( Beaker::Command ).to receive( :new ).with( "echo '#{etc_hosts}' >> /etc/hosts" ).once
       expect( host ).to receive( :exec ).once
 
       subject.set_etc_hosts(host, etc_hosts)

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -89,6 +89,22 @@ module Beaker
         end
       end
 
+      context "if :disable_updates option set true" do
+        it "calls disable_updates" do
+          options[:disable_updates] = true
+          expect( hypervisor ).to receive( :disable_updates ).once
+          hypervisor.configure
+        end
+      end
+
+      context "if :disable_updates option set false" do
+        it "does not call disable_updates_puppetlabs_com" do
+          options[:disable_updates] = false
+          expect( hypervisor ).to receive( :disable_updates ).never
+          hypervisor.configure
+        end
+      end
+
       context 'if :configure option set false' do
         it 'does not make any configure calls' do
           options[:configure]         = false

data/spec/beaker/hypervisor/vagrant_libvirt_spec.rb

@@ -21,14 +21,23 @@ describe Beaker::VagrantLibvirt do
     vagrant.provision
   end
 
-  it "can make a Vagranfile for a set of hosts" do
-    FakeFS.activate!
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
+  context 'Correct vagrant configuration' do
+    before(:each) do
+      FakeFS.activate!
+      path = vagrant.instance_variable_get( :@vagrant_path )
+      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
-    vagrant.make_vfile( @hosts )
+      vagrant.make_vfile( @hosts )
+      @vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+    end
 
-    vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
-    expect( vagrantfile ).to include( %Q{    v.vm.provider :libvirt})
+    it "can make a Vagranfile for a set of hosts" do
+      expect( @vagrantfile ).to include( %Q{    v.vm.provider :libvirt do |node|})
+    end
+
+    it "can specify the memory as an integer" do
+      expect( @vagrantfile.split("\n").map(&:strip) )
+        .to include('node.memory = 512')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.30.1
+  version: 2.31.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -694,6 +694,7 @@ files:
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
+- spec/beaker/host/aix_spec.rb
 - spec/beaker/host/eos_spec.rb
 - spec/beaker/host/freebsd/exec_spec.rb
 - spec/beaker/host/mac/group_spec.rb
@@ -702,6 +703,7 @@ files:
 - spec/beaker/host/unix/pkg_spec.rb
 - spec/beaker/host/windows/exec_spec.rb
 - spec/beaker/host/windows/group_spec.rb
+- spec/beaker/host/windows/pkg_spec.rb
 - spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb
 - spec/beaker/hypervisor/aixer_spec.rb