beaker 2.11.0 → 2.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjcxZmM2NGE2YTM1ZjAwZmU4MDI4M2U0NzZmOTk4MzMxZDg3NDRiOQ==
+    MDViYzc2MGNjNDgxMjczMmE4MmQ2NzY3NTNhOWI5ZWU1NGYxNjA4Zg==
   data.tar.gz: !binary |-
-    Y2M3MmViODg0MTdiZDIxZWZjNjIyYmExMWMwMGFkMzA4OTViZmQxOQ==
+    MmExY2UzMTI0ZDA2MzkzYzgwOGNhZTVmZDVhNWIxMDFlOWI0OGM5Mw==
 SHA512:
   metadata.gz: !binary |-
-    N2VjY2E2NmM2N2E3MGUyOTBkY2FlZTM3MjUwZjY5YjE0OGU4N2JjYTI1OWNi
-    MWM1YzIyYzgzOWM2ZWJhNjdjNmIxMzAyMmZkMzk3Njk3Mzc4ZWQwM2ZjYWZj
-    MzhiZTVmYTQ0NzE0YTU2MTVhZjg4NDBjYjlhNTk0YTQ4ZGNjMDk=
+    NDY5MjdhMGYwMWRmN2FiZGY4Y2YxYzAyNmNmYjYwOGYzZmZkN2YzYWJkY2Uy
+    YjQ3MmY2NjE1ODgyZTEyNzkxOWI4ZWRjOTk2MTFjODI0YWQzMDBkOTMwNzI5
+    ZWI4NGFjMTE5YjdjZTdmY2NjY2U5MTM1MGQ1OGRiNTU2ZGYxZTY=
   data.tar.gz: !binary |-
-    ZmRjZDhkNjU5ODQyMjY3YjZlNTc2NTIyYmYwMzNlOTA1YmJhZmFhZmQ2Y2Y3
-    ODEyODVkMzZhMjcxMTQ0NTYzYjNmYmVlZThjZWMzNmQwNWJkMTAyY2RlYzVk
-    MTNkYmQ3NjE5OTNkMTJkODk5ZGE0ZWFmNjVlODI4YjYyMTUyNzk=
+    NjBmYzBhZDcyMzA3NDdjMzUwZDVjYmFlMTEwMjllZDFhNWViMzI0NWFlNjBh
+    NDQwYTc5NGJjNGRlY2RhNzZiMThkOTU3MmU0ZmEwMmNiMTJlZDMwNzEwZmEx
+    MmE0MTE5ZmVhYTc5ZDFhZWY0NDJiNjE5ZDY1NTQ0MzEyMzcxZGM=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 6 May, 2015 (50128ac0)](#LATEST)
+* [LATEST - 20 May, 2015 (88efb0d6)](#LATEST)
+* [2.11.0 - 6 May, 2015 (b775cc73)](#2.11.0)
 * [2.10.0 - 22 Apr, 2015 (c4f37479)](#2.10.0)
 * [2.9.0 - 9 Apr, 2015 (b161d325)](#2.9.0)
 * [beaker2.8.0 - 26 Mar, 2015 (2d25d06d)](#beaker2.8.0)
@@ -79,7 +80,88 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 6 May, 2015 (50128ac0)
+### <a name = "LATEST">LATEST - 20 May, 2015 (88efb0d6)
+
+* (GEM) update beaker version to 2.12.0 (88efb0d6)
+
+* Merge pull request #790 from kevpl/bkr76_acceptance_addpresuite (4d43e91d)
+
+
+```
+Merge pull request #790 from kevpl/bkr76_acceptance_addpresuite
+
+(BKR-76) created first pre-suite acceptance tests
+```
+* Merge pull request #814 from kevpl/bkr186_test_addaccessors2 (121ee9f8)
+
+
+```
+Merge pull request #814 from kevpl/bkr186_test_addaccessors2
+
+(BKR-186) added current test info accessors to DSL
+```
+* Merge pull request #815 from kevpl/bkr232_option_noprovision_implies_no_configure_validate (f60724a6)
+
+
+```
+Merge pull request #815 from kevpl/bkr232_option_noprovision_implies_no_configure_validate
+
+(BKR-232) --no-provision now implies --no-configure & --no-validate
+```
+* Merge pull request #816 from petems/BKR-276-fix_freebsd_file_making (158273ef)
+
+
+```
+Merge pull request #816 from petems/BKR-276-fix_freebsd_file_making
+
+(BKR-276) Fixes `#echo_to_file` for FreeBSD
+```
+* (BKR-276) Fixes `#echo_to_file` for FreeBSD (d1e36080)
+
+
+```
+(BKR-276) Fixes `#echo_to_file` for FreeBSD
+
+Previous command didn't wrap printf string in `"`
+Stops command working:
+
+
+
+
+freebsd-9-x64 executed in 0.04 seconds
+Warning: ssh connection to 10.255.52.108 has been terminated
+
+freebsd-9-x64 20:12:47$ printf 127.0.0.1\tlocalhost localhost.localdomain\n10.255.52.108\tfreebsd-9-x64\n > /etc/hosts
+Attempting ssh connection to 10.255.52.108, user: root, opts: {:config=>"/var/folders/nn/408ddhln26s1b356ry19q6yr0000gp/T/freebsd-9-x6420150518-65951-3jag0b"}
+printf: missing format character
+
+
+```
+* (BKR-232) --no-provision now implies --no-configure & --no-validate (e2200d2e)
+
+* (BKR-76) sles: fixed git & gem install issues (d0d0b95d)
+
+* (BKR-76) fixed solaris 11 issues with git install (8909ff3b)
+
+* Merge pull request #799 from sschneid/vmpooler_tokens (3e545182)
+
+
+```
+Merge pull request #799 from sschneid/vmpooler_tokens
+
+(BKR-218) Support using vmpooler API tokens
+```
+* (BKR-76) added windows ruby setup steps (1f45fc57)
+
+* (BKR-186) added current test info accessors to DSL (76b07a5a)
+
+* (BKR-218) Support using vmpooler API tokens (4c860f93)
+
+* (BKR-76) created first pre-suite acceptance tests (b5d1dd1f)
+
+### <a name = "2.11.0">2.11.0 - 6 May, 2015 (b775cc73)
+
+* (HISTORY) update beaker history for gem release 2.11.0 (b775cc73)
 
 * (GEM) update beaker version to 2.11.0 (50128ac0)
 

data/acceptance/pre_suite/pe/install.rb

@@ -0,0 +1 @@
+install_pe

data/acceptance/pre_suite/puppet_gem/install.rb

@@ -0,0 +1,10 @@
+hosts.each do |host|
+  install_puppet_from_gem(host, {:version => '3.7.5'})
+
+  if host['platform'] =~ /sles/
+    host.mkdir_p(host['puppetbindir'])
+    ['facter', 'hiera', 'puppet'].each do |tool|
+      on host, "ln -s /usr/bin/#{tool}.ruby* #{host['puppetbindir']}/#{tool}"
+    end
+  end
+end

data/acceptance/pre_suite/puppet_git/install.rb

@@ -0,0 +1,151 @@
+install = [
+  'facter#stable',
+  'hiera#stable',
+  'puppet#3.7.5'
+]
+
+SourcePath  = Beaker::DSL::InstallUtils::SourcePath
+
+PACKAGES = {
+  :redhat => [
+    'git',
+    'ruby',
+    'rubygem-json', # :add_el_extras is required to find this package
+  ],
+  :debian => [
+    ['git', 'git-core'],
+    'ruby',
+  ],
+  :debian_ruby18 => [
+    'libjson-ruby',
+  ],
+  :solaris_11 => [
+    ['git', 'developer/versioning/git'],
+    ['ruby', 'runtime/ruby-18'],
+  ],
+  :solaris_10 => [
+    'coreutils',
+    'curl', # update curl to fix "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!" issue
+    'git',
+    'ruby19',
+    'ruby19_dev',
+    'gcc4core',
+  ],
+  :windows => [
+    'git',
+  # there isn't a need for json on windows because it is bundled in ruby 1.9
+  ],
+  :sles => [
+    'git-core',
+  ]
+}
+
+PLATFORM_PATTERNS = {
+  :redhat        => /fedora|el|centos/,
+  :debian        => /debian|ubuntu/,
+  :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
+  :solaris_10    => /solaris-10/,
+  :solaris_11    => /solaris-11/,
+  :windows       => /windows/,
+  :sles          => /sles/,
+}.freeze
+
+# Installs packages on the hosts.
+#
+# @param hosts [Array<Host>] Array of hosts to install packages to.
+# @param package_hash [Hash{Symbol=>Array<String,Array<String,String>>}]
+#   Keys should be a symbol for a platform in PLATFORM_PATTERNS.  Values
+#   should be an array of package names to install, or of two element
+#   arrays where a[0] is the command we expect to find on the platform
+#   and a[1] is the package name (when they are different).
+# @param options [Hash{Symbol=>Boolean}]
+# @option options [Boolean] :check_if_exists First check to see if
+#   command is present before installing package.  (Default false)
+# @return true
+def install_packages_on(hosts, package_hash, options = {})
+  return true if hosts == nil
+  check_if_exists = options[:check_if_exists]
+  hosts = [hosts] unless hosts.kind_of?(Array)
+  hosts.each do |host|
+    package_hash.each do |platform_key,package_list|
+      if pattern = PLATFORM_PATTERNS[platform_key]
+        if pattern.match(host['platform'])
+          package_list.each do |cmd_pkg|
+            if cmd_pkg.kind_of?(Array)
+              command, package = cmd_pkg
+            else
+              command = package = cmd_pkg
+            end
+            if !check_if_exists || !host.check_for_package(command)
+              host.logger.notify("Installing #{package}")
+              additional_switches = '--allow-unauthenticated' if platform_key == :debian
+              host.install_package(package, additional_switches)
+            end
+          end
+        end
+      else
+        raise("Unknown platform '#{platform_key}' in package_hash")
+      end
+    end
+  end
+  return true
+end
+
+install_packages_on(hosts, PACKAGES, :check_if_exists => true)
+
+def lookup_in_env(env_variable_name, project_name, default)
+  project_specific_name = "#{project_name.upcase.gsub("-","_")}_#{env_variable_name}"
+  ENV[project_specific_name] || ENV[env_variable_name] || default
+end
+
+def build_giturl(project_name, git_fork = nil, git_server = nil)
+  git_fork ||= lookup_in_env('FORK', project_name, 'puppetlabs')
+  git_server ||= lookup_in_env('GIT_SERVER', project_name, 'github.com')
+  repo = (git_server == 'github.com') ?
+    "#{git_fork}/#{project_name}.git" :
+    "#{git_fork}-#{project_name}.git"
+  "git://#{git_server}/#{repo}"
+end
+
+hosts.each do |host|
+  case host['platform']
+  when /windows/
+    arch = host[:ruby_arch] || 'x86'
+    step "#{host} Selected architecture #{arch}"
+
+    revision = if arch == 'x64'
+                 '2.0.0-x64'
+               else
+                 '1.9.3-x86'
+               end
+
+    step "#{host} Install ruby from git using revision #{revision}"
+    # TODO remove this step once we are installing puppet from msi packages
+    install_from_git(host, "/opt/puppet-git-repos",
+                     :name => 'puppet-win32-ruby',
+                     :path => build_giturl('puppet-win32-ruby'),
+                     :rev  => revision)
+    on host, 'cd /opt/puppet-git-repos/puppet-win32-ruby; cp -r ruby/* /'
+    on host, 'cd /lib; icacls ruby /grant "Everyone:(OI)(CI)(RX)"'
+    on host, 'cd /lib; icacls ruby /reset /T'
+    on host, 'cd /; icacls bin /grant "Everyone:(OI)(CI)(RX)"'
+    on host, 'cd /; icacls bin /reset /T'
+    on host, 'ruby --version'
+    on host, 'cmd /c gem list'
+  when /solaris/
+    on host, 'gem install json'
+  end
+end
+
+tmp_repos = []
+install.each do |reponame|
+  tmp_repos << extract_repo_info_from("https://github.com/puppetlabs/#{reponame}")
+end
+
+repos = order_packages(tmp_repos)
+
+hosts.each do |host|
+  repos.each do |repo|
+    install_from_git(host, SourcePath, repo)
+  end
+end

data/acceptance/pre_suite/puppet_pkg/install.rb

@@ -0,0 +1,7 @@
+# the version is required on windows
+# all versions are required for osx
+install_puppet({
+  :version        => '3.7.5',
+  :facter_version => '2.1.0',
+  :hiera_version  => '1.3.4',
+})

data/acceptance/tests/puppet/install_smoke.rb

@@ -0,0 +1,21 @@
+test_name "puppet install smoketest"
+
+step 'puppet install smoketest: verify \'facter --help\' can be successfully called on all hosts'
+hosts.each do |host|
+  on host, facter('--help')
+end
+
+step 'puppet install smoketest: verify \'hiera --help\' can be successfully called on all hosts'
+hosts.each do |host|
+  on host, hiera('--help')
+end
+
+step 'puppet install smoketest: verify \'puppet help\' can be successfully called on all hosts'
+hosts.each do |host|
+  on host, puppet('help')
+end
+
+step "puppet install smoketest: can get a configprint of the puppet server setting on all hosts"
+hosts.each do |host|
+  assert(!host.puppet['server'].empty?, "can get a configprint of the puppet server setting")
+end

data/lib/beaker/dsl/helpers.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-[ 'facter', 'hiera', 'host', 'puppet', 'tk', 'web' ].each do |lib|
+[ 'facter', 'hiera', 'host', 'puppet', 'test', 'tk', 'web' ].each do |lib|
       require "beaker/dsl/helpers/#{lib}_helpers"
 end
 
@@ -25,6 +25,7 @@ module Beaker
       include Beaker::DSL::Helpers::HieraHelpers
       include Beaker::DSL::Helpers::HostHelpers
       include Beaker::DSL::Helpers::PuppetHelpers
+      include Beaker::DSL::Helpers::TestHelpers
       include Beaker::DSL::Helpers::TKHelpers
       include Beaker::DSL::Helpers::WebHelpers
     end

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

@@ -0,0 +1,72 @@
+module Beaker
+  module DSL
+    module Helpers
+      # Methods that help you query the state of your tests, these
+      # methods do not require puppet to be installed to execute correctly
+      module TestHelpers
+
+        # Gets the currently executing test's name, which is set in a test
+        # using the {Beaker::DSL::Structure#test_name} method.
+        #
+        # @return [String] Test name, or nil if it hasn't been set
+        def current_test_name()
+          @metadata[:case] && @metadata[:case][:name] ? @metadata[:case][:name] : nil
+        end
+
+        # Gets the currently executing test's filename, which is set from the
+        # +@path+ variable passed into the {Beaker::TestCase#initialize} method,
+        # not including the '.rb' extension
+        #
+        # @example if the path variable was man/plan/canal.rb, then the filename would be:
+        #   canal
+        #
+        # @return [String] Test filename, or nil if it hasn't been set
+        def current_test_filename()
+          @metadata[:case] && @metadata[:case][:file_name] ? @metadata[:case][:file_name] : nil
+        end
+
+        # Gets the currently executing test's currently executing step name.
+        # This is set using the {Beaker::DSL::Structure#step} method.
+        #
+        # @return [String] Step name, or nil if it hasn't been set
+        def current_step_name()
+          @metadata[:step] && @metadata[:step][:name] ? @metadata[:step][:name] : nil
+        end
+
+        # Sets the currently executing test's name.
+        #
+        # @param [String] name Name of the test
+        #
+        # @return nil
+        # @api private
+        def set_current_test_name(name)
+          @metadata[:case] ||= {}
+          @metadata[:case][:name] = name
+        end
+
+        # Sets the currently executing test's filename.
+        #
+        # @param [String] filename Name of the file being tested
+        #
+        # @return nil
+        # @api private
+        def set_current_test_filename(filename)
+          @metadata[:case] ||= {}
+          @metadata[:case][:file_name] = filename
+        end
+
+        # Sets the currently executing step's name.
+        #
+        # @param [String] name Name of the step
+        #
+        # @return nil
+        # @api private
+        def set_current_step_name(name)
+          @metadata[:step] ||= {}
+          @metadata[:step][:name] = name
+        end
+
+      end
+    end
+  end
+end

data/lib/beaker/dsl/structure.rb

@@ -37,6 +37,7 @@ module Beaker
       # @param [Proc] block The actions to be performed in this step.
       def step step_name, &block
         logger.notify "\n  * #{step_name}\n"
+        set_current_step_name(step_name)
         yield if block_given?
       end
 
@@ -47,6 +48,7 @@ module Beaker
       #
       def test_name my_name, &block
         logger.notify "\n#{my_name}\n"
+        set_current_test_name(my_name)
         yield if block_given?
       end
 

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

@@ -5,6 +5,6 @@ module FreeBSD::Exec
     # FreeBSD gets weird about special characters, we have to go a little OTT here
     escaped_str = str.gsub(/\t/,'\\t').gsub(/\n/,'\\n')
 
-    exec(Beaker::Command.new("printf #{escaped_str} > #{filename}"))
+    exec(Beaker::Command.new("printf \"#{escaped_str}\" > #{filename}"))
   end
 end

data/lib/beaker/hypervisor/vmpooler.rb

@@ -19,6 +19,22 @@ module Beaker
       @options = options
       @logger = options[:logger]
       @hosts = vmpooler_hosts
+      @credentials = load_credentials(@options[:dot_fog])
+    end
+
+    def load_credentials(dot_fog = '.fog')
+      creds = {}
+
+      begin
+        fog = YAML.load_file(dot_fog)
+        default = fog[:default]
+
+        creds[:vmpooler_token] = default[:vmpooler_token]
+      rescue Errno::ENOENT
+        @logger.warn "Credentials file (#{@options[:dot_fog]}) not found; proceeding without authentication"
+      end
+
+      creds
     end
 
     def check_url url
@@ -62,8 +78,6 @@ module Beaker
         request_payload[h['template']] = (request_payload[h['template']].to_i + 1).to_s
       end
 
-      @logger.notify "Requesting VM set from vmpooler"
-
       last_wait, wait = 0, 1
       waited = 0 #the amount of time we've spent waiting for this host to provision
       begin
@@ -72,6 +86,13 @@ module Beaker
         http = Net::HTTP.new(uri.host, uri.port)
         request = Net::HTTP::Post.new(uri.request_uri)
 
+        if @credentials[:vmpooler_token]
+          request['X-AUTH-TOKEN'] = @credentials[:vmpooler_token]
+          @logger.notify "Requesting VM set from vmpooler (with authentication token)"
+        else
+          @logger.notify "Requesting VM set from vmpooler"
+        end
+
         request.body = request_payload.to_json
 
         response = http.request(request)

data/lib/beaker/options/command_line_parser.rb

@@ -64,6 +64,10 @@ module Beaker
                   'Do not provision vm images before testing',
                   '(default: true)' do |bool|
             @cmd_options[:provision] = bool
+            unless bool
+              @cmd_options[:validate]  = false
+              @cmd_options[:configure] = false
+            end
           end
 
           opts.on '--[no-]configure',

data/lib/beaker/test_case.rb

@@ -97,6 +97,8 @@ module Beaker
       @exception = nil
       @runtime = nil
       @teardown_procs = []
+      @metadata = {}
+      set_current_test_filename(@path ? File.basename(@path, '.rb') : nil)
 
 
       #
@@ -107,6 +109,8 @@ module Beaker
           @logger.start_sublog
           @logger.last_result = nil
 
+          set_current_step_name(nil)
+
           #add arbitrary role methods
           roles = []
           @hosts.each do |host|

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.11.0'
+    STRING = '2.12.0'
   end
 end

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

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+class ClassMixedWithDSLHelpers
+  include Beaker::DSL::Helpers
+  include Beaker::DSL::Wrappers
+  include Beaker::DSL::Roles
+  include Beaker::DSL::Patterns
+
+  def logger
+    RSpec::Mocks::Double.new('logger').as_null_object
+  end
+
+end
+
+describe ClassMixedWithDSLHelpers do
+  let(:metadata) { @metadata ? @metadata : {} }
+
+  describe '#current_test_name' do
+    it 'returns nil if the case is undefined' do
+      subject.instance_variable_set( :@metadata, metadata )
+      expect( subject.current_test_name ).to be_nil
+    end
+
+    it 'returns nil if the name is undefined' do
+      @metadata = { :case => {} }
+      subject.instance_variable_set( :@metadata, metadata )
+      expect( subject.current_test_name ).to be_nil
+    end
+
+    it 'returns the set value' do
+      name = 'holyGrail_testName'
+      @metadata = { :case => { :name => name } }
+      subject.instance_variable_set( :@metadata, metadata )
+      expect( subject.current_test_name ).to be === name
+    end
+  end
+
+  describe '#current_test_filename' do
+    it 'returns nil if the case is undefined' do
+      subject.instance_variable_set( :@metadata, metadata )
+      expect( subject.current_test_filename ).to be_nil
+    end
+
+    it 'returns nil if the name is undefined' do
+      @metadata = { :case => {} }
+      subject.instance_variable_set( :@metadata, metadata )
+      expect( subject.current_test_filename ).to be_nil
+    end
+
+    it 'returns the set value' do
+      name = 'holyGrail_testFilename'
+      @metadata = { :case => { :file_name => name } }
+      subject.instance_variable_set( :@metadata, metadata )
+      expect( subject.current_test_filename ).to be === name
+    end
+  end
+
+  describe '#current_step_name' do
+    it 'returns nil if the step is undefined' do
+      subject.instance_variable_set( :@metadata, metadata )
+      expect( subject.current_step_name ).to be_nil
+    end
+
+    it 'returns nil if the name is undefined' do
+      @metadata = { :step => {} }
+      subject.instance_variable_set( :@metadata, metadata )
+      expect( subject.current_step_name ).to be_nil
+    end
+
+    it 'returns the set value' do
+      name = 'holyGrail_stepName'
+      @metadata = { :step => { :name => name } }
+      subject.instance_variable_set( :@metadata, metadata )
+      expect( subject.current_step_name ).to be === name
+    end
+  end
+end

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

@@ -86,6 +86,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :on ).with( host, cmd ).and_yield
       expect( subject ).to receive( :stdout ).and_return( '2' )
 
+      subject.instance_variable_set( :@metadata, {} )
       version = subject.find_git_repo_versions( host, path, repository )
 
       expect( version ).to be == { 'name' => '2' }
@@ -132,6 +133,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :logger ).exactly( 3 ).times.and_return( logger )
       expect( subject ).to receive( :on ).exactly( 4 ).times
 
+      subject.instance_variable_set( :@metadata, {} )
       subject.install_from_git( host, path, repo )
     end
 
@@ -152,6 +154,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :on ).with( host, "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/* && git clean -fdx && git checkout -f #{repo[:rev]}" ).exactly( 1 ).times
       expect( subject ).to receive( :on ).with( host, "cd #{path}/#{repo[:name]} && if [ -f install.rb ]; then ruby ./install.rb ; else true; fi" ).exactly( 1 ).times
 
+      subject.instance_variable_set( :@metadata, {} )
       subject.install_from_git( host, path, repo )
     end
 
@@ -173,6 +176,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :on ).with( host, "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/* && git clean -fdx && git checkout -f #{repo[:rev]}" ).exactly( 1 ).times
       expect( subject ).to receive( :on ).with( host, "cd #{path}/#{repo[:name]} && if [ -f install.rb ]; then ruby ./install.rb ; else true; fi" ).exactly( 1 ).times
 
+      subject.instance_variable_set( :@metadata, {} )
       subject.install_from_git( host, path, repo )
     end
    end

data/spec/beaker/dsl/structure_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 class ClassMixedWithDSLStructure
   include Beaker::DSL::Structure
+  include Beaker::DSL::Helpers::TestHelpers
 end
 
 describe ClassMixedWithDSLStructure do
@@ -13,19 +14,32 @@ describe ClassMixedWithDSLStructure do
     end
 
     it 'notifies the logger' do
+      subject.instance_variable_set(:@metadata, {})
+      allow( subject ).to receive( :set_current_step_name )
       expect( subject ).to receive( :logger ).and_return( logger )
       expect( logger ).to receive( :notify )
       subject.step 'blah'
     end
 
     it 'yields if a block is given' do
+      subject.instance_variable_set(:@metadata, {})
       expect( subject ).to receive( :logger ).and_return( logger )
+      allow(  subject ).to receive( :set_current_step_name )
       expect( logger ).to receive( :notify )
       expect( subject ).to receive( :foo )
       subject.step 'blah' do
         subject.foo
       end
     end
+
+    it 'sets the metadata' do
+      subject.instance_variable_set(:@metadata, {})
+      allow( subject ).to receive( :logger ).and_return( logger )
+      allow( logger ).to receive( :notify )
+      step_name = 'pierceBrosnanTests'
+      subject.step step_name
+      expect( subject.instance_variable_get(:@metadata)[:step][:name] ).to be === step_name
+    end
   end
 
   describe '#test_name' do
@@ -34,12 +48,14 @@ describe ClassMixedWithDSLStructure do
     end
 
     it 'notifies the logger' do
+      subject.instance_variable_set(:@metadata, {})
       expect( subject ).to receive( :logger ).and_return( logger )
       expect( logger ).to receive( :notify )
       subject.test_name 'blah'
     end
 
     it 'yields if a block is given' do
+      subject.instance_variable_set(:@metadata, {})
       expect( subject ).to receive( :logger ).and_return( logger )
       expect( logger ).to receive( :notify )
       expect( subject ).to receive( :foo )
@@ -47,6 +63,15 @@ describe ClassMixedWithDSLStructure do
         subject.foo
       end
     end
+
+    it 'sets the metadata' do
+      subject.instance_variable_set(:@metadata, {})
+      allow( subject ).to receive( :logger ).and_return( logger )
+      allow( logger ).to receive( :notify )
+      test_name = '15-05-08\'s weather is beautiful'
+      subject.test_name test_name
+      expect( subject.instance_variable_get(:@metadata)[:case][:name] ).to be === test_name
+    end
   end
 
   describe '#teardown' do

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

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+module Beaker
+  describe FreeBSD::Exec do
+    class FreeBSDExecTest
+      include FreeBSD::Exec
+
+      def initialize(hash, logger)
+        @hash = hash
+        @logger = logger
+      end
+
+      def [](k)
+        @hash[k]
+      end
+
+      def to_s
+        "me"
+      end
+    end
+
+    let (:opts)     { @opts || {} }
+    let (:logger)   { double( 'logger' ).as_null_object }
+    let (:instance) { FreeBSDExecTest.new(opts, logger) }
+
+    context "echo_to_file" do
+
+      it "runs the correct echo command" do
+        expect( Beaker::Command ).to receive(:new).with('printf "127.0.0.1\tlocalhost localhost.localdomain\n10.255.39.23\tfreebsd-10-x64\n" > /etc/hosts').and_return('')
+        expect( instance ).to receive(:exec).with('').and_return(generate_result("hello", {:exit_code => 0}))
+        instance.echo_to_file('127.0.0.1\tlocalhost localhost.localdomain\n10.255.39.23\tfreebsd-10-x64\n', '/etc/hosts')
+      end
+
+    end
+  end
+end
+

data/spec/beaker/hypervisor/vmpooler_spec.rb

@@ -13,6 +13,7 @@ module Beaker
         arg
       end
       allow( Socket ).to receive( :getaddrinfo ).and_return( true )
+      allow_any_instance_of( Beaker::Vmpooler ).to receive(:load_credentials).and_return(fog_file_contents)
     end
 
     describe '#get_template_url' do

data/spec/beaker/options/command_line_parser_spec.rb

@@ -6,12 +6,18 @@ module Beaker
 
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
-      let(:full_opts_in)  {["--hosts", "host.cfg",           "--options", "opts_file", "--type", "pe", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always",   "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath",     "-m", "module",         "-q",    "--dry-run",       "--no-ntp",    "--repo-proxy",    "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast",  "--no-color",    "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants"]}
-      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file",  :type => "pe",  :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :version=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>true, :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants"}}
+      let(:full_opts_in)  {["--hosts", "host.cfg",           "--options", "opts_file", "--type", "pe", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always",   "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath",     "-m", "module",         "-q",    "--dry-run",       "--no-ntp",    "--repo-proxy",    "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast",  "--no-color",    "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure"]}
+      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file",  :type => "pe",  :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :version=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>true, :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true}}
       let(:validate_true)  {["--validate"]}
       let(:validate_false) {["--no-validate"]}
       let(:configure_true)  {['--configure']}
       let(:configure_false) {['--no-configure']}
+      let(:provision_false) {['--no-provision']}
+      let(:provision_other) {{:provision => false, :configure => false, :validate => false}}
+      let(:provision_both_in)   {['--no-provision', '--configure', '--validate']}
+      let(:provision_both_out)  {{:provision => false, :configure => true, :validate => true}}
+      let(:provision_half_in)   {['--no-provision', '--configure']}
+      let(:provision_half_out)  {{:provision => false, :configure => true, :validate => false}}
 
 
       it "can correctly read command line input" do
@@ -36,6 +42,20 @@ module Beaker
         expect{parser.usage}.to_not raise_error 
       end
 
+      context '--no-provision flag effects other options' do
+        it 'sets --no-validate/configure when --no-provision is set' do
+          expect(parser.parse(provision_false)).to be === provision_other
+        end
+
+        it 'can still have --validate & --configure set correctly when --no-provision is set' do
+          expect(parser.parse(provision_both_in)).to be === provision_both_out
+        end
+
+        it 'can override just one of the two flags when --no-provision is set' do
+          expect(parser.parse(provision_half_in)).to be === provision_half_out
+        end
+      end
+
     end
   end
 end

data/spec/beaker/test_case_spec.rb

@@ -96,5 +96,35 @@ module Beaker
       end
     end
 
+    context 'metadata' do
+      it 'sets the filename correctly from the path' do
+        answer = 'jacket'
+        path = "#{answer}.rb"
+        File.open(path, 'w') do |f|
+          f.write ""
+        end
+        @path = path
+        testcase.run_test
+        metadata = testcase.instance_variable_get(:@metadata)
+        expect(metadata[:case][:file_name]).to be === answer
+      end
+
+      it 'resets the step name' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write ""
+        end
+        @path = path
+        # we have to create a TestCase by hand, so that we can set old
+        tc = TestCase.new({}, logger, {}, path)
+        # metadata on it, so that we can test that it's being reset correctly
+        old_metadata = { :step => { :name => 'CharlieBrown' } }
+        tc.instance_variable_set(:@metadata, old_metadata)
+        tc.run_test
+        metadata = tc.instance_variable_get(:@metadata)
+        expect(metadata[:step][:name]).to be_nil
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -377,9 +377,14 @@ files:
 - acceptance/fixtures/module/tests/init.pp
 - acceptance/fixtures/module/vendor/bundle/ruby/gems.txt
 - acceptance/pre_suite/README.md
+- acceptance/pre_suite/pe/install.rb
+- acceptance/pre_suite/puppet_gem/install.rb
+- acceptance/pre_suite/puppet_git/install.rb
+- acceptance/pre_suite/puppet_pkg/install.rb
 - acceptance/tests/base/README.md
 - acceptance/tests/base/host.rb
 - acceptance/tests/puppet/README.md
+- acceptance/tests/puppet/install_smoke.rb
 - beaker.gemspec
 - bin/beaker
 - ext/completion/beaker-completion.bash
@@ -402,6 +407,7 @@ files:
 - lib/beaker/dsl/helpers/hiera_helpers.rb
 - lib/beaker/dsl/helpers/host_helpers.rb
 - lib/beaker/dsl/helpers/puppet_helpers.rb
+- lib/beaker/dsl/helpers/test_helpers.rb
 - lib/beaker/dsl/helpers/tk_helpers.rb
 - lib/beaker/dsl/helpers/web_helpers.rb
 - lib/beaker/dsl/install_utils.rb
@@ -501,6 +507,7 @@ files:
 - spec/beaker/dsl/helpers/hiera_helpers_spec.rb
 - spec/beaker/dsl/helpers/host_helpers_spec.rb
 - spec/beaker/dsl/helpers/puppet_helpers_spec.rb
+- spec/beaker/dsl/helpers/test_helpers_spec.rb
 - spec/beaker/dsl/helpers/tk_helpers_spec.rb
 - spec/beaker/dsl/helpers/web_helpers_spec.rb
 - spec/beaker/dsl/install_utils/module_utils_spec.rb
@@ -510,6 +517,7 @@ files:
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
+- spec/beaker/host/freebsd/exec_spec.rb
 - spec/beaker/host/mac/group_spec.rb
 - spec/beaker/host/mac/user_spec.rb
 - spec/beaker/host/unix/pkg_spec.rb