beaker 1.0.0 → 1.0.1.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWQyZDI5MDhjOTdlYjFmMWM0NmMyNzVjYWYyZTMxMjZkNjViMTk1Mg==
+    ODg5ZjNlOGYzYmRlZWViOTc4OWQzYjViYmEzZTdkMDNmZDYzODUxZA==
   data.tar.gz: !binary |-
-    ODYxMGI2Y2E3NDc3NTViMzBhYjRhMGNlNDkxNDljMmYyMDcwNmZjYw==
+    Mjg2YmJhNDE1OTdlMWE4OTg1YTVkOGVhNTYzMjg1ZGNlYzlmYzdhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmViMDgxMTgwZjQ3NDk5M2NhZDkwYzAwMDA0MDNlMGE4NDA1NDI4YjM4ZTkw
-    NTFhMDBhMTczMzZmMTgzMmE2YmIxNzlhMDY3MzAyMGVkY2YyMGVmMmU0Njdh
-    ZThlYWE5NzY2MDZiZTg1ZTk1OTZhZmFiZDcwZTk3ZDdlOGJiYjA=
+    MmIwNzlmODFjYjNhMjNkNDU4NTZkOTY1MDdjMTUxODM3YTEyZmMxZGFhNmNj
+    ZjgwYTNkYjU3MzQ5Yjk2NTY5OWYxYThmZDZlNjk5Mjg4NWIwYjcyY2E1OGI2
+    YWY3NTVjYzU5YzEzZTIyOWJmNjZmNTFjOGQ1NjJkODQ2OTU5YWY=
   data.tar.gz: !binary |-
-    ZDFiODE1ZjRlNjkzNDE5ODA4NmUxYmU3MmExZTQ4NDA4MTNjYzg3NjY1MmI3
-    YWNhYmJmZDcyNjM3ZGRiNDJlOGFmYzNmNTI1YjY5NWIwNDAyMzJhNjMwYjVk
-    MzUyMmI2YWQ3ODFjNWMyOTRkNjJmOTUwNjBmMDgwMzY5NmI5Mjg=
+    ZGFjYzQ0NWRiYzViYjNkNDRlY2JiM2RjM2U2ZDM1MjBmNTYzYzliYTJhMDFk
+    Y2U5ODlkMmUyYjRmZjc3MDU5NzAxMTc3YmFhZGEwZmFmYWY2MGQxMjRlZTIx
+    M2RhZDdlYThiMmU3MzI5MzVkODBhYWIzMTMxM2IzOWM1YTExYTk=

data/beaker.gemspec

@@ -1,12 +1,8 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require 'rbconfig'
-ruby_conf = defined?(RbConfig) ? RbConfig::CONFIG : Config::CONFIG
-less_than_one_nine = ruby_conf['MAJOR'].to_i == 1 && ruby_conf['MINOR'].to_i < 9
 
 Gem::Specification.new do |s|
   s.name        = "beaker"
-  s.version     = '1.0.0'
+  s.version     = '1.0.1.pre'
   s.authors     = ["Puppetlabs"]
   s.email       = ["delivery@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker"
@@ -23,24 +19,28 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 2.14.0'
   s.add_development_dependency 'fakefs', '0.4'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'simplecov' unless less_than_one_nine
+  s.add_development_dependency 'simplecov' unless RUBY_VERSION < '1.9'
 
   # Documentation dependencies
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'markdown' unless less_than_one_nine
+  s.add_development_dependency 'markdown' unless RUBY_VERSION < '1.9'
   s.add_development_dependency 'thin'
 
   # Run time dependencies
-  s.add_runtime_dependency 'json'
-  s.add_runtime_dependency 'net-ssh'
-  s.add_runtime_dependency 'net-scp'
-  s.add_runtime_dependency 'rbvmomi'
-  s.add_runtime_dependency 'blimpy'
+  s.add_runtime_dependency 'json', '~> 1.8'
+  s.add_runtime_dependency 'net-ssh', '~> 2.6'
+  s.add_runtime_dependency 'net-scp', '~> 1.1'
+  s.add_runtime_dependency 'inifile', '~> 2.0'
+
+  # Optional provisioner specific support
+  s.add_runtime_dependency 'rbvmomi', '~> 1.6'
+  s.add_runtime_dependency 'blimpy', '~> 0.6'
+  s.add_runtime_dependency 'fission', '~> 0.4'
+
+  # These are transitive dependencies that we include or pin to because...
+  # Ruby 1.8 compatibility
   s.add_runtime_dependency 'nokogiri', '1.5.10'
-  s.add_runtime_dependency 'mime-types', '1.25' if RUBY_VERSION < "1.9"
-  s.add_runtime_dependency 'fission' if RUBY_PLATFORM =~ /darwin/i
-  s.add_runtime_dependency 'inifile'
-  #unf is an 'optional' fog dependency, but it warns when it is missing
-  #  see https://github.com/fog/fog/pull/2320/commits
-  s.add_runtime_dependency 'unf'
+  s.add_runtime_dependency 'mime-types', '~> 1.25' # 2.0 won't install on 1.8
+  # So fog doesn't always complain of unmet AWS dependencies
+  s.add_runtime_dependency 'unf', '~> 0.1'
 end

data/lib/beaker/cli.rb

@@ -1,5 +1,15 @@
 module Beaker
   class CLI
+    GEMSPEC = File.join(File.expand_path(File.dirname(__FILE__)), "../../beaker.gemspec")
+    VERSION_STRING = 
+"      wWWWw
+      |o o|
+      | O |  %s!
+      |(\")|
+     / \\X/ \\
+    |   V   |
+    |   |   | "
+
     def initialize
       @options_parser = Beaker::Options::Parser.new
       @options = @options_parser.parse_args
@@ -10,6 +20,12 @@ module Beaker
         @logger.notify(@options_parser.usage)
         exit
       end
+      if @options[:version]
+        require 'rubygems' unless defined?(Gem)
+        spec = Gem::Specification::load(GEMSPEC)
+        @logger.notify(VERSION_STRING % spec.version)
+        exit
+      end
       @logger.notify(@options.dump)
 
       #add additional paths to the LOAD_PATH

data/lib/beaker/dsl/helpers.rb

@@ -449,7 +449,11 @@ module Beaker
             if host.is_pe?
               bounce_service( host, 'pe-httpd' )
             else
-              stop_puppet_from_source_on( host ) if puppet_master_started
+              if puppet_master_started
+                stop_puppet_from_source_on( host )
+              else
+                dump_puppet_log(host)
+              end
             end
 
           rescue Exception => teardown_exception
@@ -474,22 +478,43 @@ module Beaker
       # @!visibility private
       def restore_puppet_conf_from_backup( host, backup_file )
         puppetpath = host['puppetpath']
+        puppet_conf = File.join(puppetpath, "puppet.conf")
+
+        if backup_file
+          host.exec( Command.new( "if [ -f '#{backup_file}' ]; then " +
+                                      "cat '#{backup_file}' > " +
+                                      "'#{puppet_conf}'; " +
+                                      "rm -f '#{backup_file}'; " +
+                                  "fi" ) )
+        else
+          host.exec( Command.new( "rm -f '#{puppet_conf}'" ))
+        end
 
-        host.exec( Command.new( "if [ -f '#{backup_file}' ]; then " +
-                                    "cat '#{backup_file}' > " +
-                                    "'#{puppetpath}/puppet.conf'; " +
-                                    "rm -f '#{backup_file}'; " +
-                                "fi" ) )
       end
 
+      # Back up the given file in the current_dir to the new_dir
+      #
       # @!visibility private
+      #
+      # @param host [Beaker::Host] The target host
+      # @param current_dir [String] The directory containing the file to back up
+      # @param new_dir [String] The directory to copy the file to
+      # @param filename [String] The file to back up. Defaults to 'puppet.conf'
+      #
+      # @return [String, nil] The path to the file if the file exists, nil if it
+      #   doesn't exist.
       def backup_the_file host, current_dir, new_dir, filename = 'puppet.conf'
+
         old_location = current_dir + '/' + filename
         new_location = new_dir + '/' + filename + '.bak'
 
-        host.exec( Command.new( "cp #{old_location} #{new_location}" ) )
-
-        return new_location
+        if host.file_exist? old_location
+          host.exec( Command.new( "cp #{old_location} #{new_location}" ) )
+          return new_location
+        else
+          logger.warn "Could not backup file '#{old_location}': no such file"
+          nil
+        end
       end
 
       # @!visibility private
@@ -498,7 +523,6 @@ module Beaker
 
         logger.debug 'Waiting for the puppet master to start'
         unless port_open_within?( host, 8140, 10 )
-          dump_puppet_log(host)
           raise Beaker::DSL::FailTest, 'Puppet master did not start in a timely fashion'
         end
         logger.debug 'The puppet master has started'
@@ -515,9 +539,6 @@ module Beaker
             sleep 1
           end
         end
-      rescue RuntimeError => e
-        dump_puppet_log host
-        raise e
       end
 
       # @!visibility private
@@ -834,6 +855,25 @@ module Beaker
         sign_certificate_for(default)
       end
 
+      # Get a facter fact from a provided host
+      #
+      # @param [Host] host  The host to query the fact for
+      # @param [String] name The name of the fact to query for
+      # @!macro common_opts
+      #
+      # @returns String The value of the fact 'name' on the provided host
+      # @raise  [FailTest] Raises an exception if call to facter fails
+      def fact_on(host, name, opts = {})
+        result = on host, facter(name, opts)
+        result.stdout.chomp if result.stdout
+      end
+
+      # Get a facter fact from the default host
+      # @see #fact_on
+      def fact(name, opts = {})
+        fact_on(default, name, opts)
+      end
+
     end
   end
 end

data/lib/beaker/host.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'timeout'
 
 %w(command ssh_connection).each do |lib|
   begin
@@ -12,6 +13,8 @@ module Beaker
   class Host
     SELECT_TIMEOUT = 30
 
+    class CommandFailure < StandardError; end
+
     # This class providers array syntax for using puppet --configprint on a host
     class PuppetConfigReader
       def initialize(host, command)
@@ -63,23 +66,14 @@ module Beaker
     end
 
     def port_open? port
-      s = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-      sa = Socket.sockaddr_in(port, reachable_name)
-
       begin
-        s.connect_nonblock(sa)
-      rescue Errno::EINPROGRESS
-        if IO.select(nil, [s], nil, SELECT_TIMEOUT)
-          begin
-            s.connect_nonblock(sa)
-          rescue Errno::EISCONN
-            return true
-          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-            return false
-          end
+        Timeout.timeout SELECT_TIMEOUT do
+          TCPSocket.new(reachable_name, port).close
+          return true
         end
+      rescue Errno::ECONNREFUSED, Timeout::Error
+        return false
       end
-      return false
     end
 
     def up?
@@ -171,7 +165,7 @@ module Beaker
           # is it necessary to break execution??
           unless result.exit_code_in?(Array(options[:acceptable_exit_codes] || 0))
             limit = 10
-            raise "Host '#{self}' exited with #{result.exit_code} running:\n #{cmdline}\nLast #{limit} lines of output were:\n#{result.formatted_output(limit)}"
+            raise CommandFailure, "Host '#{self}' exited with #{result.exit_code} running:\n #{cmdline}\nLast #{limit} lines of output were:\n#{result.formatted_output(limit)}"
           end
         end
         # Danger, so we have to return this result?

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

@@ -13,4 +13,8 @@ module Unix::File
     paths.split(':')
   end
 
+  def file_exist?(path)
+    result = exec(Beaker::Command.new("test -e #{path}"), :acceptable_exit_codes => [0, 1])
+    result.exit_code == 0
+  end
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -1,6 +1,6 @@
 require 'open3'
 
-module Beaker 
+module Beaker
   class Vagrant < Beaker::Hypervisor
 
     # Return a random mac address
@@ -13,7 +13,7 @@ module Beaker
     def rand_chunk
       (2 + rand(252)).to_s #don't want a 0, 1, or a 255
     end
-    
+
     def randip
       "10.255.#{rand_chunk}.#{rand_chunk}"
     end
@@ -21,25 +21,24 @@ module Beaker
     def make_vfile hosts
       #HACK HACK HACK - add checks here to ensure that we have box + box_url
       #generate the VagrantFile
-      vagrant_file = "Vagrant.configure(\"2\") do |c|\n"
+      v_file = "Vagrant.configure(\"2\") do |c|\n"
       hosts.each do |host|
         host['ip'] ||= randip #use the existing ip, otherwise default to a random ip
-        vagrant_file << "  c.vm.define '#{host.name}' do |v|\n"
-        vagrant_file << "    v.vm.hostname = '#{host.name}'\n"
-        vagrant_file << "    v.vm.box = '#{host['box']}'\n"
-        vagrant_file << "    v.vm.box_url = '#{host['box_url']}'\n" unless host['box_url'].nil?
-        vagrant_file << "    v.vm.base_mac = '#{randmac}'\n"
-        vagrant_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"255.255.0.0\"\n"
-        vagrant_file << "  end\n"
+        v_file << "  c.vm.define '#{host.name}' do |v|\n"
+        v_file << "    v.vm.hostname = '#{host.name}'\n"
+        v_file << "    v.vm.box = '#{host['box']}'\n"
+        v_file << "    v.vm.box_url = '#{host['box_url']}'\n" unless host['box_url'].nil?
+        v_file << "    v.vm.base_mac = '#{randmac}'\n"
+        v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"255.255.0.0\"\n"
+        v_file << "  end\n"
         @logger.debug "created Vagrantfile for VagrantHost #{host.name}"
       end
-      vagrant_file << "  c.vm.provider :virtualbox do |vb|\n"
-      vagrant_file << "    vb.customize [\"modifyvm\", :id, \"--memory\", \"1024\"]\n"
-      vagrant_file << "  end\n"
-      vagrant_file << "end\n"
-      FileUtils.mkdir_p(@vagrant_path)
-      File.open(File.expand_path(File.join(@vagrant_path, "Vagrantfile")), 'w') do |f|
-        f.write(vagrant_file)
+      v_file << "  c.vm.provider :virtualbox do |vb|\n"
+      v_file << "    vb.customize [\"modifyvm\", :id, \"--memory\", \"1024\"]\n"
+      v_file << "  end\n"
+      v_file << "end\n"
+      File.open(@vagrant_file, 'w') do |f|
+        f.write(v_file)
       end
     end
 
@@ -66,13 +65,16 @@ module Beaker
     def set_ssh_config host, user
         f = Tempfile.new("#{host.name}")
         ssh_config = Dir.chdir(@vagrant_path) do
-          stdin, stdout = Open3.popen3('vagrant', 'ssh-config', host.name)
+          stdin, stdout, stderr, wait_thr = Open3.popen3('vagrant', 'ssh-config', host.name)
+          if not wait_thr.value.success?
+            raise "Failed to 'vagrant ssh-config' for #{host.name}"
+          end
           stdout.read
         end
         #replace hostname with ip
-        ssh_config = ssh_config.gsub(/#{host.name}/, host['ip']) 
-        #set the user 
-        ssh_config = ssh_config.gsub(/User vagrant/, "User #{user}") 
+        ssh_config = ssh_config.gsub(/#{host.name}/, host['ip']) unless not host['ip']
+        #set the user
+        ssh_config = ssh_config.gsub(/User vagrant/, "User #{user}")
         f.write(ssh_config)
         f.rewind
         host['ssh'] = {:config => f.path()}
@@ -86,32 +88,37 @@ module Beaker
       @logger = options[:logger]
       @temp_files = []
       @vagrant_hosts = vagrant_hosts
-      @vagrant_path = File.expand_path(File.join(File.basename(__FILE__), '..', 'vagrant_files', options[:hosts_file]))
+      @vagrant_path = File.expand_path(File.join(File.basename(__FILE__), '..', 'vagrant_files', File.basename(options[:hosts_file])))
+      FileUtils.mkdir_p(@vagrant_path)
+      @vagrant_file = File.expand_path(File.join(@vagrant_path, "Vagrantfile"))
 
     end
 
     def provision
-      make_vfile @vagrant_hosts
+      if @options[:provision]
+        #setting up new vagrant hosts
+        #make sure that any old boxes are dead dead dead
+        vagrant_cmd("destroy --force") if File.file?(@vagrant_file)
 
-      #stop anything currently running, that way vagrant up will re-do networking on existing boxes
-      vagrant_cmd("halt")
-      vagrant_cmd("up")
+        make_vfile @vagrant_hosts
 
+        vagrant_cmd("up")
+      end
       @logger.debug "configure vagrant boxes (set ssh-config, switch to root user, hack etc/hosts)"
       @vagrant_hosts.each do |host|
         default_user = host['user']
-
+      
         set_ssh_config host, 'vagrant'
-        
+
         copy_ssh_to_root host
         #shut down connection, will reconnect on next exec
-        host.close 
+        host.close
 
         set_ssh_config host, default_user
-
       end
 
       hack_etc_hosts @vagrant_hosts
+
     end
 
     def cleanup
@@ -121,11 +128,15 @@ module Beaker
       end
       @logger.notify "Destroying vagrant boxes"
       vagrant_cmd("destroy --force")
+      FileUtils.rm_rf(@vagrant_path)
     end
 
     def vagrant_cmd(args)
       Dir.chdir(@vagrant_path) do
-        system("vagrant #{args}")
+        run = system("vagrant #{args}")
+        if not run
+          raise "Failed to execute vagrant_cmd ( #{args} )"
+        end
       end
     end
 

data/lib/beaker/hypervisor/vcloud.rb

@@ -157,17 +157,19 @@ module Beaker
     def cleanup
       @logger.notify "Destroying vCloud boxes"
       connect_to_vsphere
-      begin
-        vm_names = @vcloud_hosts.map {|h| h['vmhostname'] }.compact
-        if @vcloud_hosts.length != vm_names.length
-          @logger.warn "Some hosts did not have vmhostname set correctly! This likely means VM provisioning was not successful"
-        end
-        vms = @vsphere_helper.find_vms vm_names
+
+      vm_names = @vcloud_hosts.map {|h| h['vmhostname'] }.compact
+      if @vcloud_hosts.length != vm_names.length
+        @logger.warn "Some hosts did not have vmhostname set correctly! This likely means VM provisioning was not successful"
+      end
+      vms = @vsphere_helper.find_vms vm_names
+      begin 
         vm_names.each do |name|
           unless vm = vms[name]
-            raise "Couldn't find VM #{name} in vSphere!"
+            @logger.warn "Unable to cleanup #{name}, couldn't find VM #{name} in vSphere!"
+            next
           end
-  
+
           if vm.runtime.powerState == 'poweredOn'
             @logger.notify "Shutting down #{vm.name}"
             duration = run_and_report_duration do
@@ -175,16 +177,24 @@ module Beaker
             end
             @logger.notify "Spent %.2f seconds halting #{vm.name}" % duration
           end
-  
+
           duration = run_and_report_duration do 
             vm.Destroy_Task
           end
           @logger.notify "Spent %.2f seconds destroying #{vm.name}" % duration
+
+        end
+      rescue RbVmomi::Fault => ex
+        if ex.fault.is_a?(RbVmomi::VIM::ManagedObjectNotFound)
+          #it's already gone, don't bother trying to delete it
+          name = vms.key(ex.fault.obj)
+          vms.delete(name)
+          vm_names.delete(name)
+          @logger.warn "Unable to destroy #{name}, it was not found in vSphere"
+          retry
         end
-      rescue => e
-        @vsphere_helper.close
-        report_and_raise(@logger, e, "Vcloud.cleanup")
       end
+      @vsphere_helper.close
     end
 
   end

data/lib/beaker/network_manager.rb

@@ -10,6 +10,17 @@ module Beaker
   class NetworkManager
     HYPERVISOR_TYPES = ['solaris', 'blimpy', 'vsphere', 'fusion', 'aix', 'vcloud', 'vagrant']
 
+    def provision? options, host 
+      #provision this box
+      # - only if we are running with --provision
+      # - only if we have a hypervisor
+      # - only if either the specific hosts has no specification or has 'provision' in its config
+      # - always if it is a vagrant box (vagrant boxes are always provisioned as they always need ssh key hacking)
+      command_line_says = options[:provision] 
+      host_says = host['hypervisor'] && (host.has_key?('provision') ? host['provision'] : true) 
+      (command_line_says && host_says) or (host['hypervisor'] =~/vagrant/)
+    end
+
     def initialize(options, logger)
       @logger = logger
       @options = options
@@ -21,16 +32,11 @@ module Beaker
     def provision
       #sort hosts into those to be provisioned and those to use non-provisioned
       @options['HOSTS'].each_key do |name|
-        host_info = @options['HOSTS'][name]
-        #check to see if this host has a hypervisor 
-        hypervisor = host_info['hypervisor'] 
-        #provision this box
-        # - only if we are running with --provision
-        # - only if we have a hypervisor
-        # - only if either the specific hosts has no specification or has 'provision' in its config
-        if @options[:provision] && hypervisor && (host_info.has_key?('provision') ? host_info['provision'] : true) #obey config file provision, defaults to provisioning vms
+        host = @options['HOSTS'][name]
+        hypervisor = host['hypervisor']
+        if provision?(@options, host)
           raise "Invalid hypervisor: #{hypervisor} (#{name})" unless HYPERVISOR_TYPES.include? hypervisor
-          @logger.debug "Hypervisor for #{name} is #{host_info['hypervisor'] || 'default' }, and I'm going to use #{hypervisor}"
+          @logger.debug "Hypervisor for #{name} is #{hypervisor}"
           @virtual_machines[hypervisor] = [] unless @virtual_machines[hypervisor]
           @virtual_machines[hypervisor] << name
         else #this is a non-provisioned machine, deal with it without hypervisors

data/lib/beaker/options/command_line_parser.rb

@@ -157,6 +157,10 @@ module Beaker
             @cmd_options[:add_el_extras] = true
           end
 
+          opts.on('--version', 'Report currently running version of beaker' ) do 
+            @cmd_options[:version] = true
+          end
+
           opts.on '-c', '--config FILE',
                   'DEPRECATED use --hosts' do |file|
             @cmd_options[:hosts_file] = file

data/lib/beaker/options/parser.rb

@@ -151,7 +151,7 @@ module Beaker
         #   overwrite defaults with command line and file options 
         @options = @options.merge(cmd_line_and_file_options)
 
-        if not @options[:help]
+        if not @options[:help] and not @options[:version]
           #read the hosts file that contains the node configuration and hypervisor info
           hosts_options = Beaker::Options::HostsFileParser.parse_hosts_file(@options[:hosts_file])
           # merge in host file vars

data/lib/beaker/test_case.rb

@@ -10,7 +10,18 @@ require 'tempfile'
 require 'benchmark'
 require 'stringio'
 require 'rbconfig'
+#include test/unit, but do not allow it to autorun on exit
 require 'test/unit'
+if defined?(Test::Unit::AutoRunner.need_auto_run?)
+  # For test-unit gem >= 2.4.9
+  Test::Unit::AutoRunner.need_auto_run = false
+elsif defined?(Test::Unit.run?)
+  # For test-unit gem < 2.4.9
+  Test::Unit.run = true
+elsif defined?(Test::Unit::Runner)
+  # For test/unit bundled in Ruby >= 1.9.3
+  Test::Unit::Runner.module_eval("@@stop_auto_run = true")
+end
 
 module Beaker
   # This class represents a single test case. A test case is necessarily
@@ -29,7 +40,6 @@ module Beaker
     rb_config_class = defined?(RbConfig) ? RbConfig : Config
     if rb_config_class::CONFIG['MAJOR'].to_i == 1 &&
       rb_config_class::CONFIG['MINOR'].to_i == 8 then
-      Test::Unit.run = true
       # The Exception raised by Ruby's STDLIB's test framework (Ruby 1.8)
       TEST_EXCEPTION_CLASS = Test::Unit::AssertionFailedError
     else

data/spec/beaker/dsl/helpers_spec.rb

@@ -524,6 +524,7 @@ describe ClassMixedWithDSLHelpers do
     def stub_host_and_subject_to_allow_the_default_testdir_argument_to_be_created
       subject.instance_variable_set(:@path, test_case_path)
       host.stub(:tmpdir).and_return(tmpdir_path)
+      host.stub(:file_exist?).and_return(true)
     end
 
     before do
@@ -535,6 +536,13 @@ describe ClassMixedWithDSLHelpers do
       expect { subject.with_puppet_running_on(host, '--foo --bar') }.to raise_error(ArgumentError, /conf_opts must be a Hash. You provided a String: '--foo --bar'/)
     end
 
+    it 'raises the early_exception if backup_the_file fails' do
+      subject.should_receive(:backup_the_file).and_raise(RuntimeError.new('puppet conf backup failed'))
+      expect {
+        subject.with_puppet_running_on(host, {})
+      }.to raise_error(RuntimeError, /puppet conf backup failed/)
+    end
+
     describe "with valid arguments" do
       before do
         Tempfile.should_receive(:open).with('beaker')
@@ -623,6 +631,12 @@ describe ClassMixedWithDSLHelpers do
           subject.with_puppet_running_on(host, {})
           expect(host).to execute_commands_matching(/cat '#{backup_location}' > '#{original_location}'/).once
         end
+
+        it "doesn't restore a non-existent file" do
+          subject.stub(:backup_the_file)
+          subject.with_puppet_running_on(host, {})
+          expect(host).to execute_commands_matching(/rm -f '#{original_location}'/)
+        end
       end
 
       describe 'handling failures' do
@@ -662,4 +676,23 @@ describe ClassMixedWithDSLHelpers do
 
     end
   end
+
+  describe '#fact_on' do
+    it 'retreives a fact on host(s)' do
+      subject.should_receive(:facter).with('osfamily',{}).once
+      subject.should_receive(:on).and_return(result)
+
+      subject.fact_on('host','osfamily')
+    end
+  end
+
+  describe '#fact' do
+    it 'delegates to #fact_on with the default host' do
+      subject.stub(:hosts).and_return(hosts)
+      subject.should_receive(:fact_on).with(master,"osfamily",{}).once
+
+      subject.fact('osfamily')
+    end
+  end
+
 end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -66,8 +66,12 @@ module Beaker
     PasswordAuthentication no
     IdentityFile /home/root/.vagrant.d/insecure_private_key
     IdentitiesOnly yes")
+      wait_thr = OpenStruct.new
+      state = mock( 'state' )
+      state.stub( :success? ).and_return( true )
+      wait_thr.value = state
 
-      Open3.stub( :popen3 ).with( 'vagrant', 'ssh-config', host.name ).and_return( [ "", out ])
+      Open3.stub( :popen3 ).with( 'vagrant', 'ssh-config', host.name ).and_return( [ "", out, "", wait_thr ])
 
       file = double( 'file' )
       file.stub( :path ).and_return( '/path/sshconfig' )
@@ -82,22 +86,41 @@ module Beaker
 
     end
 
-    it "can provision a set of hosts" do
+    describe "provisioning and cleanup" do
+
+      before :each do
+        FakeFS.activate!
+        vagrant.should_receive( :vagrant_cmd ).with( "up" ).once
+        @hosts.each do |host|
+          host_prev_name = host['user']
+          vagrant.should_receive( :set_ssh_config ).with( host, 'vagrant' ).once
+          vagrant.should_receive( :copy_ssh_to_root ).with( host ).once
+          vagrant.should_receive( :set_ssh_config ).with( host, host_prev_name ).once
+        end
+        vagrant.should_receive( :hack_etc_hosts ).with( @hosts ).once
+      end
 
-      vagrant.should_receive( :make_vfile ).with( @hosts ).once
+      it "can provision a set of hosts" do
+        vagrant.should_receive( :make_vfile ).with( @hosts ).once
+        vagrant.should_receive( :vagrant_cmd ).with( "destroy --force" ).never
+        vagrant.provision
+      end
 
-      vagrant.should_receive( :vagrant_cmd ).with( "halt" ).once
-      vagrant.should_receive( :vagrant_cmd ).with( "up" ).once
-      @hosts.each do |host|
-        host_prev_name = host['user']
-        vagrant.should_receive( :set_ssh_config ).with( host, 'vagrant' ).once
-        vagrant.should_receive( :copy_ssh_to_root ).with( host ).once
-        vagrant.should_receive( :set_ssh_config ).with( host, host_prev_name ).once
+      it "destroys an existing set of hosts before provisioning" do
+        vagrant.make_vfile(@hosts)
+        vagrant.should_receive(:vagrant_cmd).with("destroy --force").once
+        vagrant.provision
       end
-      vagrant.should_receive( :hack_etc_hosts ).with( @hosts ).once
 
+      it "can cleanup" do
+        vagrant.should_receive( :vagrant_cmd ).with( "destroy --force" ).once
+        FileUtils.should_receive( :rm_rf ).once
+
+        vagrant.provision
+        vagrant.cleanup
+
+      end
 
-      vagrant.provision
     end
 
   end

data/spec/beaker/options/command_line_parser_spec.rb

@@ -6,14 +6,14 @@ module Beaker
 
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
-      let(:full_opts) {["--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", "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath", "-m", "module", "-q", "--no-xml", "--dry-run", "--no-ntp", "--repo-proxy", "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast", "--no-color"]}
+      let(:full_opts) {["--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", "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath", "-m", "module", "-q", "--no-xml", "--dry-run", "--no-ntp", "--repo-proxy", "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast", "--no-color", "--version"]}
 
       it "can correctly read command line input" do
         expect(parser.parse!(test_opts)).to be === {:hosts_file=>"vcloud.cfg", :debug=>true, :tests=>"test.rb", :help=>true}
       end
 
       it "supports all our command line options" do
-        expect(parser.parse!(full_opts)).to be === {: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=>true, :root_keys=>true, :keyfile=>"../.ssh/id_rsa", :install=>"gitrepopath", :modules=>"module", :quiet=>true, :xml=>false, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true, :fail_mode=>"fast", :color=>false}
+        expect(parser.parse!(full_opts)).to be === {: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=>true, :root_keys=>true, :keyfile=>"../.ssh/id_rsa", :install=>"gitrepopath", :modules=>"module", :quiet=>true, :xml=>false, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true, :fail_mode=>"fast", :color=>false, :version=>true}
       end
 
       it "can produce a usage description" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.pre
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -112,128 +112,142 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: blimpy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: fission
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: fission
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.10
 - !ruby/object:Gem::Dependency
-  name: inifile
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 description: Puppetlabs accceptance testing harness
 email:
 - delivery@puppetlabs.com
@@ -387,9 +401,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.6