beaker 3.10.0 → 3.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJlZmIyZTkxMzE4ZDg2YTRkNmU1YTkwZWE3YjM1N2JlZGFiM2E5Ng==
+    ZTYxNmZjMGE0NTRhOGYxZWQ0YjI2MWI3MjgwMmU3YmI2YzE5YzRkMg==
   data.tar.gz: !binary |-
-    N2ExOTAxZWZhODM5NjcwYjVmYTk2NzcyNzEyMzU3MzNjMDE5ZDhmMw==
+    ODljNWVjNDQ1YzExNTU3Y2YwNWM3N2EwZTkwNWE2YTYxZGY1Mzg3YQ==
 SHA512:
   metadata.gz: !binary |-
-    YmQwYTZlMDM0YTBlZWUzMWIyNzU5ZTE4NmMzMzllN2U2ZDA2OThmZWQ1NWNh
-    MWFlMzUwZDg2N2FlYWQ1OWYwMGZlMmNlNzQ1ODdkNTU1NjRkMGFkZDFkZmQ5
-    Nzc3YWI5YjE2ZDhlNGY4NDFjYzcxMjg0NmI1OTYwZjk2ODliZDc=
+    ZWFiZGJhNTI2M2VmYTBiNWRjODllYmVmYjViYWYwNGI1NDQyY2Q3YTA2OTlh
+    NDIyMzE4MDU3MDE3YTg0OTEzYzIyZDEwMjk3ODdlZWUwZTM0OTJkNzg1ZTA1
+    OTkwZWVhYjBmNzIwODFjNGZkOGNjNTUwYzkwNTFiZDQ0MTliZDM=
   data.tar.gz: !binary |-
-    MmViMTUyYzY3NDY0YzczMGRiZDcwMTJkZTU0MWI3ZTcwY2U2NThiY2MwZTY3
-    NWY0NmM4YzZkYzE1ZjkzODM1YzQwMWQzMTRjNWNhYzM3ODZkMDU4ODc3Yjk3
-    NzE5NDY2Nzg2YjA0MWFkYzJjMmFjODM2MWFmYmVhYzBjNDVlYTg=
+    NjBjOGMzODJmMjVkZTZkOGU4MDVjMzkzNTI0MGUwNGVhNTU0NjViM2IzMjVk
+    NzNlMzVjNTUzOTBlMTNjZWE0MDdiOGQxZjJjZDJmMDcxZjg1ZTg1NTc0YzE2
+    NDNmNDQzYTFjZmYzOGRiOGM1ZTY3N2M1OWU5ZTZhNDQ5NzVhZjM=

data/Rakefile

@@ -176,6 +176,14 @@ Run the base beaker acceptance tests
     beaker_test(:base)
   end
 
+  desc <<-EOS
+Run the subcommand beaker acceptance tests
+#{USAGE}
+  EOS
+  task :subcommands => 'gen_hosts' do
+    beaker_test(:subcommands)
+  end
+
   desc <<-EOS
 Run the hypervisor beaker acceptance tests
 #{USAGE}

data/acceptance/config/subcommands/acceptance-options.rb

@@ -0,0 +1,4 @@
+{
+    :pre_suite => 'acceptance/pre_suite/subcommands/',
+    :tests => 'acceptance/tests/subcommands/'
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/lib/helpers/test_helper.rb

@@ -44,8 +44,8 @@ end
 
 # Returns the contents of a named fixture file, to be found in `fixture_path`.
 def fixture_contents(fixture)
-  fixture_file = File.join(fixture_path, "#{fixture}.txt")
-  File.read(fixture_file)
+  fixture_file = Dir.entries(fixture_path).find { |e| /^#{fixture}$|#{fixture}\.[a-z]/ =~ e }
+  File.read("#{fixture_path}/#{fixture_file}")
 end
 
 # Create a file on `host` in the `remote_path` with file name `filename`,

data/acceptance/pre_suite/README.md

@@ -5,3 +5,4 @@ Collection of pre-suites for SUT configuration before test execution.
 Options:
 * install PE
 * install FOSS Puppet
+* install beaker itself on a SUT

data/acceptance/pre_suite/subcommands/05_install_ruby.rb

@@ -0,0 +1,32 @@
+test_name 'Install and configure Ruby 2.2.5 on the SUT' do
+
+  step 'Ensure that the default system is an el-based system' do
+    # The pre-suite currently only supports el systems, and we should
+    #fail early if the default platform is not a supported platform
+    assert(default.platform.variant == 'el',
+           "Expected the platform variant to be 'el', not #{default.platform.variant}")
+  end
+
+  step 'clean out current ruby and its dependencies' do
+    on default, 'yum remove ruby ruby-devel -y'
+  end
+
+  # These steps install git, openssl, and wget
+  step 'install development dependencies' do
+    on default, 'yum groupinstall "Development Tools" -y'
+    on default, 'yum install openssl-devel -y'
+    on default, 'yum install wget -y'
+  end
+
+  step 'download and install ruby 2.2.5' do
+    on default, 'wget http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.5.tar.gz'
+    on default, 'tar xvfz ruby-2.2.5.tar.gz'
+    on default, 'cd ruby-2.2.5;./configure'
+    on default, 'cd ruby-2.2.5;make'
+    on default, 'cd ruby-2.2.5;make install'
+  end
+
+  step 'update gem on the SUT and install bundler' do
+    on default, 'gem update --system;gem install bundler'
+  end
+end

data/acceptance/pre_suite/subcommands/08_install_beaker.rb

@@ -0,0 +1,22 @@
+test_name 'Install beaker and checkout branch if necessary' do
+
+  step 'Download the beaker git repo' do
+   on default, 'git clone https://github.com/puppetlabs/beaker.git /opt/beaker/'
+  end
+
+  step 'Detect if checking out branch for testing and checkout' do
+    if ENV['BEAKER_PULL_ID']
+      logger.notify "Pull Request detected, checking out PR branch"
+      on(default, 'cd /opt/beaker/;git -c core.askpass=true fetch --tags --progress https://github.com/puppetlabs/beaker.git +refs/pull/*:refs/remotes/origin/pr/*')
+      on(default, "cd /opt/beaker/;git merge origin/pr/#{ENV['BEAKER_PULL_ID']}/head --no-edit")
+    else
+      logger.notify 'No PR branch detected, building from master'
+    end
+  end
+
+  step 'Build the gem and install it on the local system' do
+    build_output = on(default, 'cd /opt/beaker/;gem build beaker.gemspec').stdout
+    version = build_output.match(/^  File: (.+)$/)[1]
+    on(default, "cd /opt/beaker/;gem install #{version} --no-rdoc --no-ri")
+  end
+end

data/acceptance/tests/base/host/host_test.rb

@@ -316,3 +316,17 @@ step "Ensure scp errors close the ssh connection" do
     on default, 'true'
   end
 end
+
+step 'Ensure that a long 128+ character string with UTF-8 characters does not break net-ssh' do
+  long_string = 'a' * 128 + "\u06FF"
+  on(default, "mkdir /tmp/#{long_string}")
+  result = on(default, 'ls /tmp')
+  assert(result.stdout.include?(long_string), 'Error in folder creation with long string + UTF-8 characters')
+
+  # remove the folder
+  on(default, "rm -rf /tmp/#{long_string}")
+  result = on(default, 'ls /tmp')
+  assert(!result.stdout.include?(long_string), 'Error in folder deletion with long string + UTF-8 characters')
+
+end
+

data/acceptance/tests/subcommands/init.rb

@@ -0,0 +1,47 @@
+test_name 'use the init subcommand' do
+
+  def delete_root_folder_contents
+    on default, 'rm -rf /root/*'
+  end
+
+  step 'ensure that `beaker init` fails correctly when not provided a hypervisor' do
+    expect_failure('it should return a non-zero code when it fails') do
+      result = on(default, 'beaker init', :accept_all_exit_codes => true)
+      refute_equal(0, result.exit_code, '`beaker init` without a hypervisor argument should return a non-zero exit code')
+    end
+  end
+
+  step 'ensure that `beaker help init` works' do
+    result = on(default, 'beaker help init')
+    assert_equal(0, result.exit_code, '`beaker help init` should return a zero exit code')
+  end
+
+  step 'ensure that `beaker init` accepts both vmpooler and vagrant hypervisor arguments' do
+
+    ['vmpooler', 'vagrant'].each do |hypervisor|
+      result = on(default, "beaker init --hypervisor=#{hypervisor}")
+      assert_match(/Writing default host config/, result.stdout)
+      assert_equal(0, result.exit_code, "`beaker init --hypervisor=#{hypervisor}` should return a zero exit code")
+      step 'ensure that the Rakefile is present' do
+        on(default, '[ -e "Rakefile" ]')
+      end
+    delete_root_folder_contents
+    end
+  end
+
+
+  step 'ensure that a Rakefile is not overwritten if it does exist prior' do
+    delete_root_folder_contents
+    on(default, "beaker init --hypervisor=vmpooler")
+    prepended_rakefile = on(default, 'cat Rakefile').stdout
+    delete_root_folder_contents
+    on(default, 'echo "require \'tempfile\'" >> Rakefile')
+    on(default, 'beaker init --hypervisor=vmpooler', :accept_all_exit_codes => true)
+    rakefile = on(default, 'cat Rakefile')
+
+    # Assert that the Rakefile contents includes the original and inserted requirements
+    assert(result.stdout.include?(prepended_rakefile), 'Rakefile should not contain prepended require')
+    assert(result.stdout.include?("require 'tempfile'"), 'Rakefile should not contain prepended require')
+  end
+end
+

data/beaker.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'minitar', '~> 0.5.4'
 
   s.add_runtime_dependency 'hocon', '~> 1.0'
-  s.add_runtime_dependency 'net-ssh', '3.3.0.beta1'
+  s.add_runtime_dependency 'net-ssh', '~> 4.0'
   s.add_runtime_dependency 'net-scp', '~> 1.2'
   s.add_runtime_dependency 'inifile', '~> 2.0'
   ## inifile: keep <3.0, breaks puppet_helpers.rb:puppet_conf_for when updated

data/docs/concepts/masterless_puppet.md

@@ -23,7 +23,7 @@ In order to have Beaker support a masterless Puppet setup, you have to do a few
 
 ## What is Beaker Doing by Default?
 
-Be default (without the masterless flag), when someone calls for a host of a particular role, using the `Beaker::DSL::Roles` module's methods (ie. `master`, `dashboard`, etc), Beaker checks to verify that a host was given with that role.
+By default (without the masterless flag), when someone calls for a host of a particular role, using the `Beaker::DSL::Roles` module's methods (ie. `master`, `dashboard`, etc), Beaker checks to verify that a host was given with that role.
 
 If no host was given with this role, then Beaker throws a `DSL::Outcomes::FailTest` Error, which causes that test case to fail.
 

data/docs/how_to/hypervisors/openstack.md

@@ -123,3 +123,32 @@ user their own pool.  It's used in allocating new IPs.  It's an options
 parameter in the CONFIG section of the host file:
 
     floating_ip_pool: 'my_pool_name'
+
+### Volumes
+
+Attaching volumes to a VM is supported via the Cinder service.  All versions are transparently
+supported to cater for differences in the APIs.  To create and attach volumes simply add hash
+called 'volumes' to a host in the HOSTS section.  Each key is the name given to the volume upon
+resource creation.  The value is a hash with a single integer parameter 'size' which defines the
+volume size in MB.
+
+**Example OpenStack hosts file with volumes**
+
+    HOSTS:
+      ceph:
+        roles:
+          - master
+        platform: ubuntu-16.04-amd64
+        hypervisor: openstack
+        flavor: m1.large
+        image: xenial-server-cloudimg-amd64-scsi
+        user: ubuntu
+        volumes:
+          osd0:
+            size: 10000
+          osd1:
+            size: 10000
+          osd2:
+            size: 10000
+          journal:
+            size: 1000

data/docs/how_to/preserve_hosts.md

@@ -29,7 +29,7 @@ what files you might need from your SUTs, and exploration might be necessary.
 
 Note that where you decide to use this option will affect its precedence. You
 can learn more about this in our
-[argument processing & precedence doc](../topics/argument_processing_and_precedence.md).
+[argument processing & precedence doc](../concepts/argument_processing_and_precedence.md).
 
 ### Command-Line Option
 
@@ -54,11 +54,11 @@ You can also provide a value for this option wherever you can provide a value
 that gets merged into beaker's global options hash. The two ways to do this are
 to provide it in a local options file, or in the global `CONFIG` section of your
 hosts file. To learn more about how to set these options, check out the
-[Options File Values](../topics/argument_processing_and_precedence.md#options-file-values)
+[Options File Values](../concepts/argument_processing_and_precedence.md#options-file-values)
 and the
-[`CONFIG` Section of a Hosts File](../topics/argument_processing_and_precedence.md#config-section-of-hosts-file)
+[`CONFIG` Section of a Hosts File](../concepts/argument_processing_and_precedence.md#config-section-of-hosts-file)
 sections of the
-[argument processing & precedence doc](../topics/argument_processing_and_precedence.md).
+[argument processing & precedence doc](../concepts/argument_processing_and_precedence.md).
 
 Either way, the underlying property name that you will have to set if you use
 these options is `:preserve_hosts`.
@@ -94,5 +94,5 @@ symlink, as mentioned at the beginning of this section.
 For subsequent runs, if you want to set something, you'll have to pay attention
 to the precedence of your arguments, to be sure that you are overriding what is
 set in the preserved hosts file. Checkout the
-[argument processing & precedence doc](../topics/argument_processing_and_precedence.md)
+[argument processing & precedence doc](../concepts/argument_processing_and_precedence.md)
 for more details on the precedence order of options parsing.

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

@@ -676,7 +676,10 @@ module Beaker
         def sleep_until_puppetdb_started(host, nonssl_port = nil, ssl_port = nil)
           nonssl_port = options[:puppetdb_port_nonssl] if nonssl_port.nil?
           ssl_port = options[:puppetdb_port_ssl] if ssl_port.nil?
-          curl_with_retries("start puppetdb", host, "http://localhost:#{nonssl_port}", 0, 120)
+          endpoint = 'status/v1/services/puppetdb-status'
+          retry_on(host,
+                   "curl -m 1 http://localhost:#{nonssl_port}/#{endpoint} | grep '\"state\":\"running\"'",
+                   {:max_retries => 120})
           curl_with_retries("start puppetdb (ssl)",
                             host, "https://#{host.node_name}:#{ssl_port}", [35, 60])
         end
@@ -754,14 +757,15 @@ module Beaker
         end
 
         #wait for a given host to appear in the dashboard
+        # @deprecated this method should be removed in the next release since we don't believe the check is necessary.
         def wait_for_host_in_dashboard(host)
+
           hostname = host.node_name
-          if host['platform'] =~ /aix/ then
-            curl_opts = '--tlsv1 -I'
-          else
-            curl_opts = '--tlsv1 -k -I'
-          end
-          retry_on(dashboard, "! curl #{curl_opts} https://#{dashboard}/nodes/#{hostname} | grep '404 Not Found'")
+          hostcert = dashboard.puppet['hostcert']
+          key = dashboard.puppet['hostprivkey']
+          cacert = dashboard.puppet['localcacert']
+          retry_on(dashboard, "curl --cert #{hostcert} --key #{key} --cacert #{cacert}\
+                              https://#{dashboard}:4433/classifier-api/v1/nodes | grep '\"name\":\"#{hostname}\"'")
         end
 
         # Ensure the host has requested a cert, then sign it

data/lib/beaker/host_prebuilt_steps.rb

@@ -409,10 +409,14 @@ module Beaker
     def enable_root_login host, opts
       logger = opts[:logger]
       block_on host do |host|
-        logger.debug "Update /etc/ssh/sshd_config to allow root login"
+        logger.debug "Update sshd_config to allow root login"
         if host['platform'] =~ /osx/
-          host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /etc/sshd_config"))
-          host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config"))
+          # If osx > 10.10 use '/private/etc/ssh/sshd_config', else use '/etc/sshd_config'
+          ssh_config_file = '/private/etc/ssh/sshd_config'
+          ssh_config_file = '/etc/sshd_config' if host['platform'] =~ /^osx-10\.(9|10)/i
+
+          host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' #{ssh_config_file}"))
+          host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' #{ssh_config_file}"))
         elsif host['platform'] =~ /freebsd/
           host.exec(Command.new("sudo sed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
         elsif host['platform'] =~ /openbsd/

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -811,7 +811,18 @@ module Beaker
       ssh_string = public_key()
       region.key_pairs.import(pair_name, ssh_string)
       kp = region.key_pairs[pair_name]
-      if kp.exists?
+
+      exists = false
+      for tries in 1..5
+        if kp.exists?
+          exists = true
+          break
+        end
+        @logger.debug("AWS key pair doesn't appear to exist yet, sleeping before retry ")
+        backoff_sleep(tries)
+      end
+
+      if exists
         @logger.debug("aws-sdk: key pair #{pair_name} imported")
         kp
       else

data/lib/beaker/hypervisor/openstack.rb

@@ -122,6 +122,22 @@ module Beaker
       end
     end
 
+    # Get a hash of volumes from the host
+    def get_volumes host
+      return host['volumes'] if host['volumes']
+      {}
+    end
+
+    # Get the API version
+    def get_volume_api_version
+      case @volume_client
+      when Fog::Volume::OpenStack::V1
+        1
+      else
+        -1
+      end
+    end
+
     # Create and attach dynamic volumes
     #
     # Creates an array of volumes and attaches them to the current host.
@@ -133,23 +149,34 @@ module Beaker
     # @param host [Hash] thet current host defined in the nodeset
     # @param vm [Fog::Compute::OpenStack::Server] the server to attach to
     def provision_storage host, vm
-      if host['volumes']
+      volumes = get_volumes(host)
+      if !volumes.empty?
         # Lazily create the volume client if needed
         volume_client_create
-        host['volumes'].keys.each_with_index do |volume, index|
+        volumes.keys.each_with_index do |volume, index|
           @logger.debug "Creating volume #{volume} for OpenStack host #{host.name}"
 
           # The node defintion file defines volume sizes in MB (due to precedent
           # with the vagrant virtualbox implementation) however OpenStack requires
           # this translating into GB
-          openstack_size = host['volumes'][volume]['size'].to_i / 1000
+          openstack_size = volumes[volume]['size'].to_i / 1000
+
+          # Set up the volume creation arguments
+          args = {
+            :size        => openstack_size,
+            :description => "Beaker volume: host=#{host.name} volume=#{volume}",
+          }
+
+          # Between version 1 and subsequent versions the API was updated to
+          # rename 'display_name' to just 'name' for better consistency
+          if get_volume_api_version == 1
+            args[:display_name] = volume
+          else
+            args[:name] = volume
+          end
 
           # Create the volume and wait for it to become available
-          vol = @volume_client.volumes.create(
-            :size         => openstack_size,
-            :display_name => volume,
-            :description  => "Beaker volume: host=#{host.name} volume=#{volume}",
-          )
+          vol = @volume_client.volumes.create(**args)
           vol.wait_for { ready? }
 
           # Fog needs a device name to attach as, so invent one.  The guest
@@ -309,7 +336,24 @@ module Beaker
         @options[:openstack_keyname]
       else
         @logger.debug "Generate a new rsa key"
-        key = OpenSSL::PKey::RSA.new 2048
+
+        # There is apparently an error that can occur when generating RSA keys, probably
+        # due to some timing issue, probably similar to the issue described here:
+        # https://github.com/negativecode/vines/issues/34
+        # In order to mitigate this error, we will simply try again up to three times, and
+        # then fail if we continue to error out.
+        begin
+          retries ||= 0
+          key = OpenSSL::PKey::RSA.new 2048
+        rescue OpenSSL::PKey::RSAError => e
+          retries += 1
+          if retries > 2
+            @logger.notify "error generating RSA key #{retries} times, exiting"
+            raise e
+          end
+          retry
+        end
+
         type = key.ssh_type
         data = [ key.to_blob ].pack('m0')
         @logger.debug "Creating Openstack keypair for public key '#{type} #{data}'"

data/lib/beaker/hypervisor/vagrant_libvirt.rb

@@ -8,6 +8,13 @@ class Beaker::VagrantLibvirt < Beaker::Vagrant
     attr_reader :memory
   end
 
+  # Return a random mac address with colons
+  #
+  # @return [String] a random mac address
+  def randmac
+    "08:00:27:" + (1..3).map{"%0.2X"%rand(256)}.join(':')
+  end
+
   def provision(provider = 'libvirt')
     super
   end

data/lib/beaker/tasks/quick_start.rb

@@ -1,5 +1,7 @@
 require 'beaker-hostgenerator'
 
+CONFIG_DIR = '.beaker/acceptance/config'
+
 VAGRANT  = ['ubuntu1404-64default.mdcal-ubuntu1404-64af', '--hypervisor=vagrant',
             '--global-config={box_url=https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm,box=puppetlabs/ubuntu-14.04-64-nocm}']
 
@@ -9,17 +11,17 @@ namespace :beaker_quickstart do
 
   desc 'Generate Default Beaker Host Config File, valid options are: vmpooler or vagrant.'
   task :gen_hosts, [:hypervisor] do |t, args|
-    hosts_file = "acceptance/config/default_#{args[:hypervisor]}_hosts.yaml"
+    hosts_file = "#{CONFIG_DIR}/default_#{args[:hypervisor]}_hosts.yaml"
     if args[:hypervisor] == 'vagrant'
       cli = VAGRANT
     elsif args[:hypervisor] == 'vmpooler'
       cli = VMPOOLER
     else
       puts "No hypervisor provided, defaulting to vagrant."
-      hosts_file = "acceptance/config/default_vagrant_hosts.yaml"
+      hosts_file = "#{CONFIG_DIR}/default_vagrant_hosts.yaml"
       cli = VAGRANT
     end
-    FileUtils.mkdir_p('acceptance/config') # -p ignores when dir already exists
+    FileUtils.mkdir_p("#{CONFIG_DIR}") # -p creates intermediate directories as required
     puts "About to run - beaker-hostgenerator #{cli.to_s.delete!('[]"')}"
     if !File.exist?(hosts_file) then
       puts "Writing default host config to file - #{hosts_file}"
@@ -90,4 +92,4 @@ def beaker_command(system_args)
   cmd_parts << "--pre-suite #{system_args[:pre_suite]}"
   cmd_parts << "--tests #{system_args[:tests]}"
   cmd_parts.flatten.join(" ")
-end
+end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.10.0'
+    STRING = '3.11.0'
   end
 end

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

@@ -1096,14 +1096,14 @@ describe ClassMixedWithDSLHelpers do
 
     it 'uses the default ports if none given' do
       host = hosts[0]
-      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8080/, anything(), anything() ).once.ordered
+      expect( subject ).to receive( :retry_on ).with( anything(), /8080/, anything() ).once.ordered
       expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8081/, anything() ).once.ordered
       subject.sleep_until_puppetdb_started( host )
     end
 
     it 'allows setting the nonssl_port' do
       host = hosts[0]
-      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8084/, anything(), anything() ).once.ordered
+      expect( subject ).to receive( :retry_on ).with( anything(), /8084/, anything() ).once.ordered
       expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8081/, anything() ).once.ordered
       subject.sleep_until_puppetdb_started( host, 8084 )
 
@@ -1111,7 +1111,7 @@ describe ClassMixedWithDSLHelpers do
 
     it 'allows setting the ssl_port' do
       host = hosts[0]
-      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8080/, anything(), anything() ).once.ordered
+      expect( subject ).to receive( :retry_on ).with( anything(), /8080/, anything() ).once.ordered
       expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8085/, anything() ).once.ordered
       subject.sleep_until_puppetdb_started( host, nil, 8085 )
     end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -51,11 +51,21 @@ describe Beaker do
     "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""
   ], true
 
-  it_should_behave_like 'enables_root_login', 'osx', [
+  it_should_behave_like 'enables_root_login', 'osx-10.10', [
     "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config",
     "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /etc/sshd_config"
   ]
 
+  it_should_behave_like 'enables_root_login', 'osx-10.11', [
+    "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
+    "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config"
+  ]
+
+  it_should_behave_like 'enables_root_login', 'osx-10.12', [
+      "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
+      "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config"
+  ]
+
   # Solaris
   it_should_behave_like 'enables_root_login', 'solaris-10', [
     "sudo -E svcadm restart network/ssh",
@@ -538,8 +548,16 @@ describe Beaker do
   context "set_env" do
     subject { dummy_class.new }
 
-    it "permits user environments on an OS X host" do
-      test_host_ssh_permit_user_environment('osx')
+    it "permits user environments on an OS X 10.10 host" do
+      test_host_ssh_permit_user_environment('osx-10.10')
+    end
+
+    it "permits user environments on an OS X 10.11 host" do
+      test_host_ssh_permit_user_environment('osx-10.11')
+    end
+
+    it "permits user environments on an OS X 10.12 host" do
+      test_host_ssh_permit_user_environment('osx-10.12')
     end
 
     it "permits user environments on an ssh-based linux host" do
@@ -571,8 +589,16 @@ describe Beaker do
     end
 
 
-    it "sets user ssh environment on an OS X host" do
-      test_host_ssh_set_user_environment('osx')
+    it "sets user ssh environment on an OS X 10.10 host" do
+      test_host_ssh_set_user_environment('osx-10.10')
+    end
+
+    it "sets user ssh environment on an OS X 10.11 host" do
+      test_host_ssh_set_user_environment('osx-10.11')
+    end
+
+    it "sets user ssh environment on an OS X 10.12 host" do
+      test_host_ssh_set_user_environment('osx-10.12')
     end
 
     it "sets user ssh environment on an ssh-based linux host" do

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -839,12 +839,13 @@ module Beaker
       end
 
       it 'imports the key given from public_key' do
-        expect(pair).to receive(:exists?).and_return (true)
+        expect(pair).to receive(:exists?).and_return(true)
         aws.create_new_key_pair(region, pair_name)
       end
 
       it 'raises an exception if subsequent keypair check is false' do
-        expect(pair).to receive(:exists?).and_return (false)
+        expect(pair).to receive(:exists?).and_return(false).exactly(5).times
+        expect(aws).to receive(:backoff_sleep).exactly(5).times
         expect { aws.create_new_key_pair(region, pair_name) }.
           to raise_error(RuntimeError,
             "AWS key pair #{pair_name} can not be queried, even after import")

data/spec/beaker/hypervisor/openstack_spec.rb

@@ -104,5 +104,57 @@ module Beaker
       (1..3).each { openstack.get_ip }
     end
 
+    it 'creates volumes with cinder v1' do
+      # Mock a volume
+      allow(openstack).to receive(:get_volumes).and_return({'volume1' => {'size' => 1000000 }})
+
+      # Stub out the call to create the client and hard code the return value
+      allow(openstack).to receive(:volume_client_create).and_return(nil)
+      client = double().as_null_object
+      openstack.instance_variable_set(:@volume_client, client)
+      allow(openstack).to receive(:get_volume_api_version).and_return(1)
+
+      # Check the parameters are valid, correct 'name' parameter and correct size conversion
+      mock_volume = double().as_null_object
+      expect(client).to receive(:create).with(:display_name => 'volume1', :description => 'Beaker volume: host=alan volume=volume1', :size => 1000).and_return(mock_volume)
+      allow(mock_volume).to receive(:wait_for).and_return(nil)
+
+      # Perform the test!
+      mock_vm = double().as_null_object
+      allow(mock_volume).to receive(:id).and_return('Fake ID')
+      expect(mock_vm).to receive(:attach_volume).with('Fake ID', '/dev/vdb')
+
+      mock_host = double().as_null_object
+      allow(mock_host).to receive(:name).and_return('alan')
+
+      openstack.provision_storage mock_host, mock_vm
+    end
+
+    it 'creates volumes with cinder v2' do
+      # Mock a volume
+      allow(openstack).to receive(:get_volumes).and_return({'volume1' => {'size' => 1000000 }})
+
+      # Stub out the call to create the client and hard code the return value
+      allow(openstack).to receive(:volume_client_create).and_return(nil)
+      client = double().as_null_object
+      openstack.instance_variable_set(:@volume_client, client)
+      allow(openstack).to receive(:get_volume_api_version).and_return(-1)
+
+      # Check the parameters are valid, correct 'name' parameter and correct size conversion
+      mock_volume = double().as_null_object
+      expect(client).to receive(:create).with(:name => 'volume1', :description => 'Beaker volume: host=alan volume=volume1', :size => 1000).and_return(mock_volume)
+      allow(mock_volume).to receive(:wait_for).and_return(nil)
+
+      # Perform the test!
+      mock_vm = double().as_null_object
+      allow(mock_volume).to receive(:id).and_return('Fake ID')
+      expect(mock_vm).to receive(:attach_volume).with('Fake ID', '/dev/vdb')
+
+      mock_host = double().as_null_object
+      allow(mock_host).to receive(:name).and_return('alan')
+
+      openstack.provision_storage mock_host, mock_vm
+    end
+
   end
 end

data/spec/beaker/hypervisor/vagrant_libvirt_spec.rb

@@ -29,7 +29,6 @@ describe Beaker::VagrantLibvirt 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, options )
       @vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
@@ -53,5 +52,10 @@ describe Beaker::VagrantLibvirt do
       expect( @vagrantfile.split("\n").map(&:strip) )
         .to include("node.uri = 'qemu+ssh://root@host/system'")
     end
+
+    it "has a mac address in the proper format" do
+      expect( @vagrantfile.split("\n").map(&:strip) )
+        .to include(/:mac => "08:00:27:\h{2}:\h{2}:\h{2}"/)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -140,16 +140,16 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0.beta1
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0.beta1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -416,13 +416,14 @@ files:
 - acceptance/config/puppetgit/acceptance-options.rb
 - acceptance/config/puppetpe/acceptance-options.rb
 - acceptance/config/puppetpkg/acceptance-options.rb
+- acceptance/config/subcommands/acceptance-options.rb
 - acceptance/fixtures/README.md
 - acceptance/fixtures/files/failing_shell_script.txt
 - acceptance/fixtures/files/retry_script.txt
 - acceptance/fixtures/files/shell_script_with_output.txt
 - acceptance/fixtures/files/simple_text_file.txt
-- acceptance/fixtures/files/sles-11-x86_64.repo.txt
-- acceptance/fixtures/files/sles-12-x86_64.repo.txt
+- acceptance/fixtures/files/sles-11-x86_64.repo
+- acceptance/fixtures/files/sles-12-x86_64.repo
 - acceptance/fixtures/module/Gemfile
 - acceptance/fixtures/module/README.md
 - acceptance/fixtures/module/Rakefile
@@ -476,6 +477,8 @@ files:
 - acceptance/pre_suite/puppet_gem/install.rb
 - acceptance/pre_suite/puppet_git/install.rb
 - acceptance/pre_suite/puppet_pkg/install.rb
+- acceptance/pre_suite/subcommands/05_install_ruby.rb
+- acceptance/pre_suite/subcommands/08_install_beaker.rb
 - acceptance/tests/base/README.md
 - acceptance/tests/base/dsl/helpers/configuration_test.rb
 - acceptance/tests/base/dsl/helpers/hocon_helpers_test.rb
@@ -520,6 +523,7 @@ files:
 - acceptance/tests/puppet/stub_host.rb
 - acceptance/tests/puppet/web_helpers_test.rb
 - acceptance/tests/puppet/with_puppet_running_on.rb
+- acceptance/tests/subcommands/init.rb
 - beaker.gemspec
 - bin/beaker
 - docs/README.md