beaker 1.4.1 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWMwOGVmNTJlZTJiMTIzMjc1YmQxOWEyNzhlNmIwMmY1YmQ3ZDBjNQ==
+    ODViOGJiN2ZhMDlmNjQ4NmQxNTNkMjZiNjhlYTc5MjI0NzIyNmEzMA==
   data.tar.gz: !binary |-
-    YWI3MmJkNzI2NWZhZDlkMDdlY2E4OGZlYTE3MTY2NDY2Yzk4YzZjNQ==
+    N2U1MDk2NWUwZjNmNGE2Zjc0MDQ2Y2ZhMzk3M2ZjYTJkMWNhMmJhYw==
 SHA512:
   metadata.gz: !binary |-
-    MDk0YmJiMTE2YzQ4NjYwZDNmNDAwM2Q4MTNlYjc3YzM5ZDY1MDA0YzBlN2Mx
-    Mjc4ZTQzNGVjYTkxOGI5MDkxNTAzOTAxMDk0MWE3YTM2YWQyYTE1Y2Q0NTFl
-    ZDNlMmQ3MmMwOTQ4ZjcxZDcxOTJlOTAwZjM2MTc5MWY3NjNkZjU=
+    Yjg1OTYzNGNmZTBiOTU2YWMwZjA5NjUyOTc5M2JhZjY2NTMwOTQxNzk2NTNk
+    OWYzNGU4NzgxNjA0NGIxYmMyNWQzNzYxM2Q4Y2U1MWY4MTE3MDg5M2I1Y2Ey
+    NGUwYWI5OTIyZGRlNTU4MjYzYmMwMTkxZTUxMTkwYWFmMDk5NDE=
   data.tar.gz: !binary |-
-    MTkyYzUzMGYyNTRkYjRmZWQ3OGY0YzRiMzFhMDMyM2QzMDdiNDAyOTJiYzRi
-    NWY5YTY2YTM1NTYxMTU4NTZmOGQ1ZGE2M2IwOGYxOWY0OWQwNTg3NDY4OGVh
-    NDcyYzEzMTAxMjk4NjliNDZiNmE2OThmYWViM2MxZjM1NTM2MGY=
+    ZWZjY2FlNzE2MzNmZDE4MDJlMjFiMzEyMjNlOWFiZDZmNDExMjU5Y2U1YWQw
+    MDUyODBlMzIwM2VmNDNhMmVjOWZjOWRlMGQxODYzZTFmNzQ2OWVhOWI4MDU0
+    Njk1YWEzMDk3M2JlMDlhZjZmMDkxNDNiNjAwZWE5ZWUxODQyZGM=

data/lib/beaker/cli.rb

@@ -67,7 +67,7 @@ module Beaker
                      [:add_master_entry, "Update /etc/hosts on master with master's ip", Proc.new {@setup.add_master_entry}]]
       begin
         #setup phase
-        setup_steps.each do |step| 
+        setup_steps.each do |step|
           if (not @options.has_key?(step[0])) or @options[step[0]]
             @logger.notify ""
             @logger.notify "Setup: #{step[1]}"
@@ -91,8 +91,10 @@ module Beaker
         validate
         setup
 
+        errored = false
+
         #pre acceptance  phase
-        run_suite(:pre_suite, :fail_fast)
+        run_suite(:pre_suite, :fast)
 
         #testing phase
         begin
@@ -100,8 +102,10 @@ module Beaker
         #post acceptance phase
         rescue => e
           #post acceptance on failure
-          #if we error then run the post suite as long as we aren't in fail-stop mode
-          run_suite(:post_suite) unless @options[:fail_mode] == "stop"
+          #run post-suite if we are in fail-slow mode
+          if @options[:fail_mode] =~ /slow/
+            run_suite(:post_suite)
+          end
           raise e
         else
           #post acceptance on success
@@ -110,9 +114,8 @@ module Beaker
       #cleanup phase
       rescue => e
         #cleanup on error
-        #only do cleanup if we aren't in fail-stop mode
-        @logger.notify "Cleanup: cleaning up after failed run"
-        if @options[:fail_mode] != "stop"
+        if @options[:preserve_hosts] =~ /(never)/
+          @logger.notify "Cleanup: cleaning up after failed run"
           if @network_manager
             @network_manager.cleanup
           end
@@ -120,9 +123,11 @@ module Beaker
         raise "Failed to execute tests!"
       else
         #cleanup on success
-        @logger.notify "Cleanup: cleaning up after successful run"
-        if @network_manager
-          @network_manager.cleanup
+        if @options[:preserve_hosts] =~ /(never)|(onfail)/
+          @logger.notify "Cleanup: cleaning up after successful run"
+          if @network_manager
+            @network_manager.cleanup
+          end
         end
       end
     end

data/lib/beaker/dsl/install_utils.rb

@@ -238,6 +238,17 @@ module Beaker
         end
       end
 
+      #Classify the master so that it can deploy frictionless packages for a given host.
+      # @param [Host] host The host to install pacakges for
+      # @api private
+      def deploy_frictionless_to_master(host)
+        klass = host['platform'].gsub(/-/, '_').gsub(/\./,'')
+        klass = "pe_repo::platform::#{klass}"
+        on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec rake nodeclass:add[#{klass},skip]"
+        on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec rake node:addclass[#{master},#{klass}]"
+        on master, "puppet agent -t", :acceptable_exit_codes => [0,2]
+      end
+
       #Perform a Puppet Enterprise upgrade or install
       # @param [Array<Host>] hosts The hosts to install or upgrade PE on 
       # @param  [Hash{Symbol=>Symbol, String}] options The options
@@ -289,6 +300,10 @@ module Beaker
             if (! host['roles'].include? 'frictionless') || version_is_less(version, '3.2.0')
               answers = Beaker::Answers.answers(options[:pe_ver] || host['pe_ver'], hosts, master_certname, options)
               create_remote_file host, "#{host['working_dir']}/answers", Beaker::Answers.answer_string(host, answers)
+            else
+              # If We're *not* running the classic installer, we want
+              # to make sure the master has packages for us.
+              deploy_frictionless_to_master(host)
             end
 
             on host, installer_cmd(host, options)

data/lib/beaker/dsl/roles.rb

@@ -29,7 +29,10 @@ module Beaker
         hosts_as 'agent'
       end
 
-      # The host for which ['roles'] include 'master'
+      # The host for which ['roles'] include 'master'.
+      # If no host has the 'master' role, then use the host defined as 'default'.
+      # If no host is defined as a 'master' and there is no 'default' host defined then
+      # raise an error.
       #
       # @return [Array<Host>]
       # @raise [Beaker::DSL::Outcomes::FailTest] if there are less
@@ -39,7 +42,11 @@ module Beaker
       #     on, master, 'cat /etc/puppet/puppet.conf'
       #
       def master
-        find_only_one :master
+        begin
+          find_only_one :master
+        rescue DSL::Outcomes::FailTest => e
+          default
+        end
       end
 
       # The host for which ['roles'] include 'database'

data/lib/beaker/network_manager.rb

@@ -64,16 +64,13 @@ module Beaker
     end
 
     def cleanup
-      #only cleanup if we aren't preserving hosts
       #shut down connections
       @hosts.each {|host| host.close }
 
-      if not @options[:preserve_hosts]
-        if @provisioned_set
-          @provisioned_set.each_key do |type|
-            if @provisioned_set[type]
-              @provisioned_set[type].cleanup
-            end
+      if @provisioned_set
+        @provisioned_set.each_key do |type|
+          if @provisioned_set[type]
+            @provisioned_set[type].cleanup
           end
         end
       end

data/lib/beaker/options/command_line_parser.rb

@@ -66,9 +66,14 @@ module Beaker
             @cmd_options[:provision] = bool
           end
 
-          opts.on '--[no-]preserve-hosts',
-                  'Preserve cloud instances' do |value|
-            @cmd_options[:preserve_hosts] = value
+          opts.on '--preserve-hosts [MODE]',
+                  'How should SUTs be treated post test',
+                  'Possible values:',
+                  'always (keep SUTs alive)',
+                  'onfail (keep SUTs alive if failures occur during testing)',
+                  'never (cleanup SUTs - shutdown and destroy any changes made during testing)',
+                  '(default: never)'  do |mode|
+            @cmd_options[:preserve_hosts] = mode || 'always'
           end
 
           opts.on '--root-keys',
@@ -145,9 +150,11 @@ module Beaker
           opts.on '--fail-mode [MODE]',
                   'How should the harness react to errors/failures',
                   'Possible values:',
-                  'fast (skip all subsequent tests, cleanup, exit)',
-                  'stop (skip all subsequent tests, do no cleanup, exit immediately)'  do |mode|
-            @cmd_options[:fail_mode] = mode
+                  'fast (skip all subsequent tests)',
+                  'slow (attempt to continue run post test failure)',
+                  'stop (DEPRECATED, please use fast)',
+                  '(default: slow)'  do |mode|
+            @cmd_options[:fail_mode] = mode =~ /stop/ ? 'fast' :  mode
           end
 
           opts.on '--[no-]ntp',

data/lib/beaker/options/hosts_file_parser.rb

@@ -25,6 +25,7 @@ module Beaker
         end
 
         # Make sure the roles array is present for all hosts
+        host_options['HOSTS'] ||= {}
         host_options['HOSTS'].each_key do |host|
           host_options['HOSTS'][host]['roles'] ||= []
         end

data/lib/beaker/options/parser.rb

@@ -239,8 +239,13 @@ module Beaker
         end
 
         #check for valid fail mode
-        if not ["fast", "stop", nil].include?(@options[:fail_mode])
-          parser_error "--fail-mode must be one of fast, stop" 
+        if @options[:fail_mode] !~ /stop|fast|slow/
+          parser_error "--fail-mode must be one of fast or slow, not '#{@options[:fail_mode]}'" 
+        end
+
+        #check for valid preserve_hosts option
+        if @options[:preserve_hosts] !~ /always|onfail|never/
+          parser_error "--preserve_hosts must be one of always, onfail or never, not '#{@options[:preserve_hosts]}'"
         end
 
         #check for config files necessary for different hypervisors
@@ -273,8 +278,8 @@ module Beaker
             parser_error "Only agent nodes may have the role 'frictionless', fix #{@options[:hosts_file]}"
           end
         end
-        if master > 1 or master < 1
-          parser_error "One and only one host/node may have the role 'master', fix #{@options[:hosts_file]}"
+        if master > 1
+          parser_error "Only one host/node may have the role 'master', fix #{@options[:hosts_file]}"
         end
 
         #check that solaris/windows/el-4 boxes are only agents

data/lib/beaker/options/presets.rb

@@ -34,14 +34,14 @@ module Beaker
           :options_file => nil,
           :type => 'pe',
           :provision => true,
-          :preserve_hosts => false,
+          :preserve_hosts => 'never',
           :root_keys => false,
           :quiet => false,
           :xml => false,
           :color => true,
           :dry_run => false,
           :timeout => 300,
-          :fail_mode => nil,
+          :fail_mode => 'slow',
           :timesync => false,
           :repo_proxy => false,
           :add_el_extras => false,

data/lib/beaker/test_suite.rb

@@ -57,10 +57,10 @@ module Beaker
           @logger.debug msg
         when :fail
           @logger.error msg
-          break if fail_mode #all failure modes cause us to kick out early on failure
+          break if fail_mode !~ /slow/ #all failure modes except slow cause us to kick out early on failure
         when :error
           @logger.warn msg
-          break if fail_mode #all failure modes cause use to kick out early on error
+          break if fail_mode !~ /slow/ #all failure modes except slow cause us to kick out early on failure
         end
       end
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.4.1'
+    STRING = '1.5.0'
   end
 end

data/spec/beaker/cli_spec.rb

@@ -0,0 +1,156 @@
+require 'spec_helper'
+
+module Beaker
+  describe CLI, :use_fakefs => true do
+    let(:cli)      { Beaker::CLI.new }
+
+    context 'execute!' do
+      before :each do
+        stub_const("Beaker::Logger", double().as_null_object )
+        File.open("sample.cfg", "w+") do |file|
+          file.write("HOSTS:\n")
+          file.write("  myhost:\n")
+          file.write("    roles:\n")
+          file.write("      - master\n")
+          file.write("    platform: ubuntu-x-x\n")
+          file.write("CONFIG:\n")
+        end
+        cli.stub(:setup).and_return(true)
+        cli.stub(:validate).and_return(true)
+        cli.stub(:provision).and_return(true)
+      end
+     
+      describe "test fail mode" do
+        it 'continues testing after failed test if using slow fail_mode' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_throw("bad test")
+          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'slow'
+          cli.instance_variable_set(:@options, options)
+
+          cli.should_receive(:run_suite).exactly( 3 ).times
+          expect{ cli.execute! }.to raise_error
+
+        end
+
+        it 'stops testing after failed test if using fast fail_mode' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_throw("bad test")
+          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'fast'
+          cli.instance_variable_set(:@options, options)
+
+          cli.should_receive(:run_suite).twice
+          expect{ cli.execute! }.to raise_error
+
+        end
+      end
+ 
+      describe "SUT preserve mode" do
+        it 'cleans up SUTs post testing if tests fail and preserve_hosts = never' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_throw("bad test")
+          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'fast'
+          options[:preserve_hosts] = 'never'
+          cli.instance_variable_set(:@options, options)
+
+          netmanager = double(:netmanager)
+          cli.instance_variable_set(:@network_manager, netmanager)
+          netmanager.should_receive(:cleanup).once
+
+          expect{ cli.execute! }.to raise_error
+
+        end
+
+        it 'cleans up SUTs post testing if no tests fail and preserve_hosts = never' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_return(true)
+          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'fast'
+          options[:preserve_hosts] = 'never'
+          cli.instance_variable_set(:@options, options)
+
+          netmanager = double(:netmanager)
+          cli.instance_variable_set(:@network_manager, netmanager)
+          netmanager.should_receive(:cleanup).once
+
+          expect{ cli.execute! }.to_not raise_error
+
+        end
+
+
+        it 'preserves SUTs post testing if no tests fail and preserve_hosts = always' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_return(true)
+          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'fast'
+          options[:preserve_hosts] = 'always'
+          cli.instance_variable_set(:@options, options)
+
+          netmanager = double(:netmanager)
+          cli.instance_variable_set(:@network_manager, netmanager)
+          netmanager.should_receive(:cleanup).never
+
+          expect{ cli.execute! }.to_not raise_error
+
+        end
+
+        it 'preserves SUTs post testing if no tests fail and preserve_hosts = always' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_throw("bad test")
+          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'fast'
+          options[:preserve_hosts] = 'always'
+          cli.instance_variable_set(:@options, options)
+
+          netmanager = double(:netmanager)
+          cli.instance_variable_set(:@network_manager, netmanager)
+          netmanager.should_receive(:cleanup).never
+
+          expect{ cli.execute! }.to raise_error
+        end
+
+        it 'cleans up SUTs post testing if no tests fail and preserve_hosts = onfail' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_return(true)
+          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'fast'
+          options[:preserve_hosts] = 'onfail'
+          cli.instance_variable_set(:@options, options)
+
+          netmanager = double(:netmanager)
+          cli.instance_variable_set(:@network_manager, netmanager)
+          netmanager.should_receive(:cleanup).once
+
+          expect{ cli.execute! }.to_not raise_error
+
+        end
+
+        it 'preserves SUTs post testing if tests fail and preserve_hosts = onfail' do
+          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
+          cli.stub(:run_suite).with(:tests).and_throw("bad test")
+          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'fast'
+          options[:preserve_hosts] = 'onfail'
+          cli.instance_variable_set(:@options, options)
+
+          netmanager = double(:netmanager)
+          cli.instance_variable_set(:@network_manager, netmanager)
+          netmanager.should_receive(:cleanup).never
+
+          expect{ cli.execute! }.to raise_error
+
+        end
+      end
+    end
+  end
+end

data/spec/beaker/dsl/roles_spec.rb

@@ -39,14 +39,19 @@ describe ClassMixedWithDSLRoles do
     end
     it 'raises an error if there is more than one master' do
       @hosts = [ master, monolith ]
-      subject.should_receive( :hosts ).and_return( hosts )
+      subject.should_receive( :hosts ).exactly( 5 ).times.and_return( hosts )
       expect { subject.master }.to raise_error Beaker::DSL::FailTest
     end
-    it 'and raises an error if there is no master' do
+    it 'and raises an error if there is no master and no default' do
       @hosts = [ agent1, agent2, custom ]
-      subject.should_receive( :hosts ).and_return( hosts )
+      subject.should_receive( :hosts ).exactly( 4 ).times.and_return( hosts )
       expect { subject.master }.to raise_error Beaker::DSL::FailTest
     end
+    it 'returns the default when there is no master' do
+      @hosts = [ agent1 ]
+      subject.should_receive( :hosts ).exactly( 3 ).times.and_return( hosts )
+      expect( subject.master ).to be == agent1 
+    end
   end
   describe '#dashboard' do
     it 'returns the dashboard if there is one' do

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", "--version", "--log-level", "info"]}
+      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", "always", "--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", "--log-level", "info"]}
 
       it "can correctly read command line input" do
         expect(parser.parse!(test_opts)).to be === {:hosts_file=>"vcloud.cfg", :log_level=>"debug", :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, :version=>true, :log_level=>"info"}
+        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=>"always", :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, :log_level=>"info"}
       end
 
       it "can produce a usage description" do

data/spec/beaker/options/parser_spec.rb

@@ -154,12 +154,12 @@ module Beaker
       it "can correctly combine arguments from different sources" do
         FakeFS.deactivate!
         args = ["-h", hosts_path, "--log-level", "debug", "--type", "git", "--install", "PUPPET/1.0,HIERA/hello"]
-        expect(parser.parse_args(args)).to be === {:log_level=>"debug", :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>false, :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>nil, :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
+        expect(parser.parse_args(args)).to be === {:log_level=>"debug", :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
       end
 
-      it "ensures that file-mode is one of fast/stop" do
+      it "ensures that fail-mode is one of fast/slow" do
         FakeFS.deactivate!
-        args = ["-h", hosts_path, "--log-level", "debug", "--fail-mode", "slow"] 
+        args = ["-h", hosts_path, "--log-level", "debug", "--fail-mode", "nope"] 
         expect{parser.parse_args(args)}.to raise_error(ArgumentError)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -337,6 +337,7 @@ files:
 - lib/beaker/utils/validator.rb
 - lib/beaker/version.rb
 - spec/beaker/answers_spec.rb
+- spec/beaker/cli_spec.rb
 - spec/beaker/command_spec.rb
 - spec/beaker/dsl/assertions_spec.rb
 - spec/beaker/dsl/helpers_spec.rb
@@ -414,6 +415,7 @@ specification_version: 4
 summary: Let's test Puppet!
 test_files:
 - spec/beaker/answers_spec.rb
+- spec/beaker/cli_spec.rb
 - spec/beaker/command_spec.rb
 - spec/beaker/dsl/assertions_spec.rb
 - spec/beaker/dsl/helpers_spec.rb