beaker 1.15.0 → 1.16.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODI2NmQ0ZDdmZjljMDEzNzJhY2QwZWY1OGVjYzVmZjUzM2M1NDU2OA==
+    YzBmNDU3OTYwNGM3YTEwYjk2MjZlNmNjNzg5MDg1YTExMGRlOTMwMQ==
   data.tar.gz: !binary |-
-    NzkzYTA2YjFmMWMwY2YzMjNiZmE0ZmE1NzVhMjA2NWFkMjFhMDllYg==
+    NWMzMzg3NDRlMTUyMDliN2E4NDBiODQ5ODY2MGNmNWZiYTNhMWRjOQ==
 SHA512:
   metadata.gz: !binary |-
-    MzA0YTM2ZTEzMjZkNjIwZmM0OTU1OWRhYzNkYWI3OGU2NDMwMjBiYzk4MDg5
-    MDMwY2VlMGE4OWQ5MTEwMzU1NjJhNTQ2MTY0YzFmNzM5Yzk4NjU0NmNmNjk1
-    NjcyNWFmZWRkNzU2NjY4MDFiN2U2NTEwNTMwNWRhMTRiOGUyZTI=
+    MTQ3NWM0MmVhZjRkZjU4NTE4NTMwMWM5YTAwMGU1ZmI1YTI4ZDgxMjQ0NzEy
+    MjVmOWM3YjIwYzY4YjNiNGU3MmNhZDg2MDBiZGU1MjZhZDk5NzdlY2UwNTE1
+    NDZlMDFmZjZiYWY4NzRmN2RjNWZjZjM5NGI4M2U2ZTIyYjA1N2E=
   data.tar.gz: !binary |-
-    MjMwNGNkOTg1M2Q1N2ZjODMyNThlNTg2NTlkOTg1ZmY4Zjc3YTBhYTFmMGZi
-    ZDgzNGZlODdjN2Q5N2JkZGU4ZDIxMmE5MDQ1ODU0MGU4ZTliZmJmYjU3NGEx
-    ZjBhMTYxZTc2MTYxZmEyM2EzZDliMTY0ZGE5ZDE0YmQxZTY3MjE=
+    OWFlYTRiOTYxYzQ1ODYxYmI2NGYwNDQyMDQ2NjFiOWI1MzY3MDZiYjYxZjhl
+    YzM3OGQyMzYyMTBjNmExZDlkZWZmOTk4NzZkZDBhODc0NzE3NmY1YmExMmNh
+    NDZiNmJjMzc1MTYwMjRhNzkyYzM3M2U4OWEwMjkxMjIwOWE0NzE=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # beaker - History
 ## Tags
-* [LATEST - 8 Jul, 2014 (cc636ca0)](#LATEST)
+* [LATEST - 17 Jul, 2014 (b0558827)](#LATEST)
+* [beaker1.15.0 - 8 Jul, 2014 (82bb4ef9)](#beaker1.15.0)
 * [beaker1.14.1 - 3 Jul, 2014 (d2e750d5)](#beaker1.14.1)
 * [beaker1.14.0 - 3 Jul, 2014 (cf8ea838)](#beaker1.14.0)
 * [beaker1.13.1 - 23 Jun, 2014 (aa09552d)](#beaker1.13.1)
@@ -50,7 +51,192 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 8 Jul, 2014 (cc636ca0)
+### <a name = "LATEST">LATEST - 17 Jul, 2014 (b0558827)
+
+* Merge pull request #364 from anodelman/make-gem (b0558827)
+
+
+```
+Merge pull request #364 from anodelman/make-gem
+
+(GEM) version bump for beaker 1.16.0
+```
+* (GEM) version bump for beaker 1.16.0 (6664c6ab)
+
+* Merge pull request #363 from puppetlabs/revert-359-issue/master/qeng-188-foss-service-restarts (56cfac77)
+
+
+```
+Merge pull request #363 from puppetlabs/revert-359-issue/master/qeng-188-foss-service-restarts
+
+Revert "(QENG-188) Allow foss runs to use service scripts"
+```
+* Revert "(QENG-188) Allow foss runs to use service scripts" (dbfa7b23)
+
+* Merge pull request #359 from jpartlow/issue/master/qeng-188-foss-service-restarts (d2464451)
+
+
+```
+Merge pull request #359 from jpartlow/issue/master/qeng-188-foss-service-restarts
+
+(QENG-188) Allow foss runs to use service scripts
+```
+* Merge pull request #360 from anodelman/fail-slow (0d0c9239)
+
+
+```
+Merge pull request #360 from anodelman/fail-slow
+
+(QENG-927) Beaker does not honor --fail-mode always fails fast
+```
+* (QENG-927) Beaker does not honor --fail-mode always fails fast (755f13eb)
+
+
+```
+(QENG-927) Beaker does not honor --fail-mode always fails fast
+
+- bug comes from regex comparison with a symbol not being coerced to a
+  string in ruby 1.8, simple adding a 'to_s' resolves this
+```
+* Merge pull request #358 from waynr/bugfix/ezbake-utils (b83f5299)
+
+
+```
+Merge pull request #358 from waynr/bugfix/ezbake-utils
+
+(QENG-924) Fix Beaker::DSL::EZBakeUtils.conditionally_clone
+```
+* Merge pull request #357 from jpartlow/issue/master/qeng-923-ensure-platform-codename (06aa5b81)
+
+
+```
+Merge pull request #357 from jpartlow/issue/master/qeng-923-ensure-platform-codename
+
+(QENG-923) Ensure @codename is set if platform string has codename
+```
+* (QENG-924) Fix Beaker::DSL::EZBakeUtils.conditionally_clone (b6cd1ac6)
+
+
+```
+(QENG-924) Fix Beaker::DSL::EZBakeUtils.conditionally_clone
+
+Fetch from origin then checkout the origin HEAD.
+
+Signed-off-by: Wayne <wayne@puppetlabs.com>
+```
+* (QENG-923) Ensure @codename is set if platform string has codename (26724829)
+
+
+```
+(QENG-923) Ensure @codename is set if platform string has codename
+
+Beaker 1.14.0 and up has a change to Beaker::Platform which ensures that
+@version and @codename is set if the platform string contains the
+version number, and that @version is set if platform string contains the
+codename, but it fails to set the @codename in this later case.
+
+Puppet currently has debian/ubuntu configs checked (used in ci) which
+use platform strings of the form debian-wheezy-x86_64. We could change
+these, but it looks like the intention of the Beaker::Platform object is
+to provide @version and @codename (where codenames are used).
+
+This patch ensures that @codename is set along with @version in these
+cases.
+```
+* Merge pull request #356 from anodelman/utf-8-encoding (842a0d99)
+
+
+```
+Merge pull request #356 from anodelman/utf-8-encoding
+
+(QENG-912) Beaker 1.14 breaks PE Puppet Acceptance
+```
+* Merge pull request #354 from anodelman/scp-repair (6e0261f2)
+
+
+```
+Merge pull request #354 from anodelman/scp-repair
+
+(QENG-6) Beaker DSL `scp_*` commands print the options hash as if...
+```
+* (QENG-912) Beaker 1.14 breaks PE Puppet Acceptance (928fad7f)
+
+
+```
+(QENG-912) Beaker 1.14 breaks PE Puppet Acceptance
+
+- was too conservative in removing non utf-8 compliant characters -
+  ended up removing compliant characters along with undef/invalid
+  character codes
+- tested locally and it preserved messages like:
+/etc/puppet/modules
+├── jimmy-appleseed (v1.1.0)
+├── jimmy-crakorn (v0.4.0)
+└── jimmy-thelock (v1.0.0)
+- correctly removed actual undef/invalid characters so that string
+  methods can be run (ie, split, gsub)
+```
+* Merge pull request #338 from anodelman/add-history (9e6acd2e)
+
+
+```
+Merge pull request #338 from anodelman/add-history
+
+(QENG-849) beaker should maintain a history file that provides...
+```
+* (QENG-6) Beaker DSL `scp_*` commands print the options hash as if... (9aca3a1d)
+
+
+```
+(QENG-6) Beaker DSL `scp_*` commands print the options hash as if...
+
+... it were executed on the command line
+- simply remove the option hash from the debug line, it isn't
+  appropriate there.
+```
+* (QENG-849) beaker should maintain a history file that provides... (04bf6d4f)
+
+
+```
+(QENG-849) beaker should maintain a history file that provides...
+
+...information per gem release
+
+- generate a markdown history file from beaker git log
+```
+* (QENG-188) Allow foss runs to use service scripts (881311ab)
+
+
+```
+(QENG-188) Allow foss runs to use service scripts
+
+Prior to this commit, any run of beaker with a non-pe master that
+attempted to stand up a master with a particular configuration in order
+to test against it using the with_puppet_running_on() helper would
+always stand up a webrick master by executing `puppet master <args>` and
+then later stop it with `kill`.
+
+The platform team needs to be able to run acceptance suites in which the
+puppetmaster is started/stopped using package provided init scripts, or
+by restarting apache if a passenger puppetmaster package is installed.
+
+This PR makes a few additions to OptionsHash, Host and the DSL::Helpers
+to allow us to distinguish foss hosts which were spun up from source
+from those which were installed from packages.  And if we are working
+with packages, whether we will be attempting to restart a running
+service or stop/start using service scripts.
+```
+### <a name = "beaker1.15.0">beaker1.15.0 - 8 Jul, 2014 (82bb4ef9)
+
+* Merge pull request #353 from anodelman/make-gem (82bb4ef9)
+
+
+```
+Merge pull request #353 from anodelman/make-gem
+
+(HISTORY) generate history file for beaker 1.15.0
+```
+* (HISTORY) generate history file for beaker 1.15.0 (bd77ab99)
 
 * Merge pull request #351 from anodelman/make-gem (cc636ca0)
 

data/Rakefile

@@ -9,6 +9,10 @@ task :yard do
   Rake::Task['docs:gen'].invoke
 end
 
+task :history do
+  Rake::Task['history:gen'].invoke
+end
+
 task :travis do
   Rake::Task['yard'].invoke unless RUBY_VERSION < '1.9'
   Rake::Task['spec'].invoke
@@ -24,14 +28,31 @@ namespace :test do
   end
 end
 
-
 ###########################################################
 #
-#   Documentation Tasks
+#   History Tasks
 #
 ###########################################################
+namespace :history do
+  desc 'Generate HISTORY.md'
+  task :gen do
+    original_dir = Dir.pwd
+    Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
+    output = `bundle exec ruby history.rb .`
+    puts output
+    if output !~ /success/
+      raise "History generation failed"
+    end
+    Dir.chdir( original_dir )
+  end
 
+end
 
+###########################################################
+#
+#   Documentation Tasks
+#
+###########################################################
 DOCS_DAEMON = "yard server --reload --daemon --server thin"
 FOREGROUND_SERVER = 'bundle exec yard server --reload --verbose --server thin lib/beaker'
 

data/beaker.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'markdown' unless RUBY_VERSION < '1.9'
   s.add_development_dependency 'thin'
+  s.add_development_dependency 'gitlab-grit'
 
   # Run time dependencies
   s.add_runtime_dependency 'json', '~> 1.8'

data/history.rb

@@ -0,0 +1,57 @@
+# Generates a HISTORY.md file for your repo based on tags and commits
+# Requires: gem install gitlab-grit
+# Usage: ruby history.rb /your/repo/directory
+#
+# Based on https://coderwall.com/p/99mjcg
+
+require 'grit'
+
+if ARGV.size < 1
+  p "Usage: ruby history.rb /your/repo/directory"
+  exit
+end
+
+output_file = 'HISTORY.md'
+repo_dir = ARGV[0]
+output = "# #{File.basename(File.absolute_path(repo_dir))} - History\n"
+
+repo = Grit::Repo.new(repo_dir)
+head = Grit::Tag.new(repo.commits.first.sha, repo, repo.commits.first.id)
+tags = repo.tags + [head]
+tags.sort! {|x,y| y.commit.authored_date <=> x.commit.authored_date}
+
+output << "## Tags\n"
+tags.each do |tag|
+  tag_name = tag.name
+  if tag == tags.first
+    tag_name = 'LATEST'
+  end
+  output << "* [#{tag_name} - #{tag.commit.authored_date.strftime("%-d %b, %Y")} (#{tag.commit.sha[0,8]})](##{tag_name})\n"
+end
+
+output << "\n## Details\n"
+tagcount = 0
+tags.each do |tag|
+  tag_name = tag.name
+  if tag == tags.first
+    tag_name = 'LATEST'
+  end
+  output << "### <a name = \"#{tag_name}\">#{tag_name} - #{tag.commit.authored_date.strftime("%-d %b, %Y")} (#{tag.commit.sha[0,8]})\n\n"
+  if (tagcount != tags.size - 1)
+    commit_set = repo.commits_between(tags[tagcount + 1].name, tag.name)
+    commit_set.sort! {|x,y| y.authored_date <=> x.authored_date }
+    commit_set.each do |c|
+      output << "* #{c.short_message} (#{c.sha[0,8]})\n\n"
+      if c.short_message != c.message
+        output << "\n```\n#{c.message.gsub(/```/, "\n")}\n```\n"
+      end
+    end
+  else
+    output << "* Initial release.\n"
+  end
+  tagcount += 1
+end
+
+File.open(output_file, 'w') { |f| f.write(output) }
+
+puts "success, output sent to #{output_file}"

data/lib/beaker/cli.rb

@@ -90,7 +90,7 @@ module Beaker
         rescue => e
           #post acceptance on failure
           #run post-suite if we are in fail-slow mode
-          if @options[:fail_mode] =~ /slow/
+          if @options[:fail_mode].to_s =~ /slow/
             run_suite(:post_suite)
           end
           raise e
@@ -101,7 +101,7 @@ module Beaker
       #cleanup phase
       rescue => e
         #cleanup on error
-        if @options[:preserve_hosts] =~ /(never)/
+        if @options[:preserve_hosts].to_s =~ /(never)/
           @logger.notify "Cleanup: cleaning up after failed run"
           if @network_manager
             @network_manager.cleanup
@@ -114,7 +114,7 @@ module Beaker
         exit 1
       else
         #cleanup on success
-        if @options[:preserve_hosts] =~ /(never)|(onfail)/
+        if @options[:preserve_hosts].to_s =~ /(never)|(onfail)/
           @logger.notify "Cleanup: cleaning up after successful run"
           if @network_manager
             @network_manager.cleanup

data/lib/beaker/dsl/ezbake_utils.rb

@@ -65,7 +65,7 @@ module Beaker
       #
       def ezbake_stage project_name, project_version, ezbake_dir="tmp/ezbake"
         ezbake_tools_available?
-        conditionally_clone "git@github.com:puppetlabs/ezbake.git", ezbake_dir
+        conditionally_clone "gitmirror@github.delivery.puppetlabs.net:puppetlabs-ezbake.git", ezbake_dir
 
         package_version = ''
         Dir.chdir(ezbake_dir) do
@@ -207,7 +207,8 @@ module Beaker
       def conditionally_clone(upstream_uri, local_path)
         ezbake_tools_available?
         if system "git --work-tree=#{local_path} --git-dir=#{local_path}/.git status"
-          system "git --work-tree=#{local_path} --git-dir=#{local_path}/.git pull"
+          system "git --work-tree=#{local_path} --git-dir=#{local_path}/.git fetch origin"
+          system "git --work-tree=#{local_path} --git-dir=#{local_path}/.git checkout origin/HEAD"
         else
           parent_dir = File.dirname(local_path)
           FileUtils.mkdir_p(parent_dir)

data/lib/beaker/host.rb

@@ -207,14 +207,14 @@ module Beaker
     end
 
     def do_scp_to source, target, options
-      @logger.debug "localhost $ scp #{source} #{@name}:#{target} #{options.to_s}"
+      @logger.debug "localhost $ scp #{source} #{@name}:#{target}"
       result = connection.scp_to(source, target, options, $dry_run)
       return result
     end
 
     def do_scp_from source, target, options
 
-      @logger.debug "localhost $ scp #{@name}:#{source} #{target} #{options.to_s}"
+      @logger.debug "localhost $ scp #{@name}:#{source} #{target}"
       result = connection.scp_from(source, target, options, $dry_run)
       return result
     end

data/lib/beaker/junit.xsl

@@ -75,12 +75,13 @@
             <xsl:variable name="testsuite_name"><xsl:value-of select="@name"/></xsl:variable>
 
             <xsl:variable name="testsuite_name_safe" select="translate($testsuite_name,'.','_')" />
-            <xsl:variable name="testsuite_tests"><xsl:value-of select="@tests"/></xsl:variable>
+            <xsl:variable name="testsuite_attempted"><xsl:value-of select="@tests"/></xsl:variable>
             <xsl:variable name="testsuite_errors"><xsl:value-of select="@errors"/></xsl:variable>
             <xsl:variable name="testsuite_failures"><xsl:value-of select="@failures"/></xsl:variable>
             <xsl:variable name="testsuite_time"><xsl:value-of select="@time"/></xsl:variable>
             <xsl:variable name="testsuite_skip"><xsl:value-of select="@skip"/></xsl:variable>
             <xsl:variable name="testsuite_pending"><xsl:value-of select="@pending"/></xsl:variable>
+            <xsl:variable name="testsuite_total"><xsl:value-of select="@total"/></xsl:variable>
             <xsl:variable name="testsuite_panel_type">
               <xsl:choose>
                 <xsl:when test="$testsuite_errors > 0 or $testsuite_failures > 0">danger</xsl:when>
@@ -103,7 +104,7 @@
                       <div class="col-md-2">
                       </div>
                       <div class="col-md-2">
-                        <h4>Total: <xsl:value-of select="$testsuite_tests" /></h4>
+                        <h4>Attempted: <xsl:value-of select="$testsuite_attempted" /></h4>
                       </div>
                       <div class="col-md-2">
                         <h4>Failed: <xsl:value-of select="$testsuite_errors + $testsuite_failures" /></h4>
@@ -114,6 +115,9 @@
                       <div class="col-md-2">
                         <h4>Pending: <xsl:value-of select="$testsuite_pending" /></h4>
                       </div>
+                      <div class="col-md-2">
+                        <h4>Total: <xsl:value-of select="$testsuite_total" /></h4>
+                      </div>
                     </div> <!-- row -->
                   </a>
                 </div> <!-- panel-title -->

data/lib/beaker/logger.rb

@@ -141,11 +141,11 @@ module Beaker
           convert s
         end
       else
-        if string.respond_to?( :encode )
+        if string.respond_to?( :force_encoding )
           # We're running in >= 1.9 and we'll need to convert
           # Remove invalid and undefined UTF-8 character encodings
-          encoding = Encoding ? Encoding.default_external : "UTF-8"
-          return string.encode(encoding, string.encoding, :invalid => :replace, :undef => :replace, :replace => '')
+          string.force_encoding('UTF-8')
+          return string.chars.select{|i| i.valid_encoding?}.join
         else
           # We're running 1.8, do nothing
           string

data/lib/beaker/platform.rb

@@ -63,6 +63,7 @@ module Beaker
 
       if codename_version_hash
         if codename_version_hash[version]
+          @codename = version
           @version = codename_version_hash[version]
         else
           version = version.delete('.')

data/lib/beaker/result.rb

@@ -31,11 +31,11 @@ module Beaker
     end
 
     def convert string
-      if string.respond_to?( :encode )
+      if string.respond_to?( :force_encoding )
         # We're running in >= 1.9 and we'll need to convert
         # Remove invalid and undefined UTF-8 character encodings
-        encoding = Encoding ? Encoding.default_external : "UTF-8"
-        return string.encode(encoding, string.encoding, :invalid => :replace, :undef => :replace, :replace => '')
+        string.force_encoding('UTF-8')
+        return string.chars.select{|i| i.valid_encoding?}.join
       else
         # We're running in < 1.9 and Ruby doesn't care
         return string

data/lib/beaker/test_suite.rb

@@ -12,7 +12,7 @@ module Beaker
 
     #Holds the output of a test suite, formats in plain text or xml
     class TestSuiteResult
-      attr_accessor :start_time, :stop_time
+      attr_accessor :start_time, :stop_time, :total_tests
 
       #Create a {TestSuiteResult} instance.
       #@param [Hash{Symbol=>String}] options Options for this object
@@ -107,6 +107,7 @@ module Beaker
                 Errored: #{errored_tests}
                 Skipped: #{skipped_tests}
                 Pending: #{pending_tests}
+                  Total: #{@total_tests}
 
       - Specific Test Case Status -
         ] % [elapsed_time, average_test_time]
@@ -191,6 +192,7 @@ module Beaker
           suite['failures'] = failed_tests
           suite['skip']     = skipped_tests
           suite['pending']  = pending_tests
+          suite['total']    = @total_tests
           suite['time']     = "%f" % (stop_time - start_time)
           properties = Nokogiri::XML::Node.new('properties', doc)
           @options.each_pair do | name, value |
@@ -281,7 +283,7 @@ module Beaker
       @hosts      = hosts
       @run        = false
       @options    = options
-      @fail_mode  = fail_mode
+      @fail_mode  = fail_mode || @options[:fail_mode]
       @test_suite_results = TestSuiteResult.new(@options, name)
       @timestamp = timestamp
 
@@ -308,6 +310,7 @@ module Beaker
       Beaker.const_set(:Log, @logger) unless defined?( Log )
 
       @test_suite_results.start_time = start_time
+      @test_suite_results.total_tests = @test_files.length
 
       @test_files.each do |test_file|
         @logger.notify "Begin #{test_file}"
@@ -326,10 +329,10 @@ module Beaker
           @logger.debug msg
         when :fail
           @logger.error msg
-          break if @fail_mode !~ /slow/ #all failure modes except slow cause us to kick out early on failure
+          break if @fail_mode.to_s !~ /slow/ #all failure modes except slow cause us to kick out early on failure
         when :error
           @logger.warn msg
-          break if @fail_mode !~ /slow/ #all failure modes except slow cause us to kick out early on failure
+          break if @fail_mode.to_s !~ /slow/ #all failure modes except slow cause us to kick out early on failure
         end
       end
       @test_suite_results.stop_time = Time.now

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.15.0'
+    STRING = '1.16.0'
   end
 end

data/spec/beaker/logger_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 
 module Beaker
@@ -6,6 +7,23 @@ module Beaker
     let(:logger) { Logger.new(my_io, :quiet => true)  }
 
 
+    context '#convert' do
+      let(:valid_utf8)  { "/etc/puppet/modules\n├── jimmy-appleseed (\e[0;36mv1.1.0\e[0m)\n├── jimmy-crakorn (\e[0;36mv0.4.0\e[0m)\n└── jimmy-thelock (\e[0;36mv1.0.0\e[0m)\n" }
+      let(:invalid_utf8) {"/etc/puppet/modules\n├── jimmy-appleseed (\e[0;36mv1.1.0\e[0m)\n├── jimmy-crakorn (\e[0;36mv0.4.0\e[0m)\n└── jimmy-thelock (\e[0;36mv1.0.0\e[0m)\xAD\n"}
+
+      it 'preserves valid utf-8 strings' do
+        expect( logger.convert(valid_utf8) ).to be === valid_utf8
+      end
+      it 'strips out invalid utf-8 characters' do
+        #this is 1.9 behavior only
+        if RUBY_VERSION.to_f >= 1.9
+          expect( logger.convert(invalid_utf8) ).to be === valid_utf8
+        else
+          pending "not supported in ruby 1.8 (using #{RUBY_VERSION})"
+        end
+      end
+    end
+
     context 'new' do
       it 'does not duplicate STDOUT when directly passed to it' do
         stdout_logger = Logger.new STDOUT

data/spec/beaker/platform_spec.rb

@@ -36,11 +36,24 @@ module Beaker
 
         it "sets codename to nil" do
           @name = "centos-6.5-x86_64"
-          expect{ platform.codename }.to be { nil }
+          expect(platform.codename).to be_nil
         end
 
       end
 
+      describe "platforms with version and codename" do
+        it "intializes both version and codename if given version" do
+          @name = "debian-7-x86_64"
+          expect(platform.version).to eq('7')
+          expect(platform.codename).to eq('wheezy')
+        end
+
+        it "intializes both version and codename if given codename" do
+          @name = "debian-wheezy-x86_64"
+          expect(platform.version).to eq('7')
+          expect(platform.codename).to eq('wheezy')
+        end
+      end
     end
 
     context 'to_array' do

data/spec/beaker/test_case_spec.rb

@@ -84,6 +84,16 @@ module Beaker
         testcase.should_receive( :log_and_fail_test ).once.with(kind_of(Timeout::Error))
         testcase.run_test
       end
+
+      it 'correctly handles CommandFailure' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write "raise Host::CommandFailure"
+        end
+        @path = path
+        testcase.should_receive( :log_and_fail_test ).once.with(kind_of(Host::CommandFailure))
+        testcase.run_test
+      end
     end
 
   end

data/spec/beaker/test_suite_spec.rb

@@ -13,14 +13,12 @@ module Beaker
       let(:sh_test)  { File.expand_path(test_dir + '/my_shell_file.sh')   }
 
       it 'fails without test files' do
-        expect { Beaker::TestSuite.new 'name', 'hosts',
-                  Hash.new, :stop_on_error }.to raise_error
+        expect { Beaker::TestSuite.new('name', 'hosts', Hash.new, Time.now, :stop_on_error) }.to raise_error
       end
 
       it 'includes specific files as test file when explicitly passed' do
         @files = [ rb_test ]
-        ts = Beaker::TestSuite.new 'name', 'hosts', options,
-                                             :stop_on_error
+        ts = Beaker::TestSuite.new('name', 'hosts', options, Time.now, :stop_on_error)
 
         expect { ts.instance_variable_get(:@test_files).
                   include? rb_test }.to be_true
@@ -28,6 +26,79 @@ module Beaker
 
     end
 
+    context 'run', :use_fakefs => true do
+
+      let( :options )     { make_opts.merge({ :logger => double().as_null_object, 'name' => create_files(@files), :log_dir => '.' }) }
+      let(:broken_script) { "raise RuntimeError" }
+      let(:fail_script)   { "raise Beaker::DSL::Outcomes::FailTest" }
+      let(:okay_script)   { "true" }
+      let(:rb_test)       { 'my_ruby_file.rb'     }
+      let(:pl_test)       { '/my_perl_file.pl'    }
+      let(:sh_test)       { '/my_shell_file.sh'   }
+
+      it 'fails fast if fail_mode != :slow and runtime error is raised' do
+        Logger.stub('new')
+        @files = [ rb_test, pl_test, sh_test]
+        File.open(rb_test, 'w') { |file| file.write(broken_script) }
+        File.open(pl_test, 'w') { |file| file.write(okay_script) }
+        File.open(sh_test, 'w') { |file| file.write(okay_script) }
+
+        ts = Beaker::TestSuite.new( 'name', 'hosts', options, Time.now, :stop )
+        tsr = ts.instance_variable_get( :@test_suite_results )
+        tsr.stub(:write_junit_xml).and_return( true )
+        tsr.stub(:summarize).and_return( true )
+
+        ts.run
+        expect( tsr.errored_tests ).to be === 1
+        expect( tsr.failed_tests ).to be === 0
+        expect( tsr.test_count ).to be === 1
+        expect( tsr.passed_tests).to be === 0
+
+      end
+
+      it 'fails fast if fail_mode != :slow and fail test is raised' do
+        Logger.stub('new')
+        @files = [ rb_test, pl_test, sh_test]
+        File.open(rb_test, 'w') { |file| file.write(fail_script) }
+        File.open(pl_test, 'w') { |file| file.write(okay_script) }
+        File.open(sh_test, 'w') { |file| file.write(okay_script) }
+
+        ts = Beaker::TestSuite.new( 'name', 'hosts', options, Time.now, :stop )
+        tsr = ts.instance_variable_get( :@test_suite_results )
+        tsr.stub(:write_junit_xml).and_return( true )
+        tsr.stub(:summarize).and_return( true )
+
+        ts.run
+        expect( tsr.errored_tests ).to be === 0
+        expect( tsr.failed_tests ).to be === 1
+        expect( tsr.test_count ).to be === 1
+        expect( tsr.passed_tests).to be === 0
+
+      end
+
+      it 'fails slow if fail_mode = :slow, even if a test fails and there is a runtime error' do
+        Logger.stub('new')
+        @files = [ rb_test, pl_test, sh_test]
+        File.open(rb_test, 'w') { |file| file.write(broken_script) }
+        File.open(pl_test, 'w') { |file| file.write(fail_script) }
+        File.open(sh_test, 'w') { |file| file.write(okay_script) }
+
+        ts = Beaker::TestSuite.new( 'name', 'hosts', options, Time.now, :slow )
+        tsr = ts.instance_variable_get( :@test_suite_results )
+        tsr.stub(:write_junit_xml).and_return( true )
+        tsr.stub(:summarize).and_return( true )
+
+        ts.run
+        expect( tsr.errored_tests ).to be === 1
+        expect( tsr.failed_tests ).to be === 1
+        expect( tsr.test_count ).to be === 3
+        expect( tsr.passed_tests).to be === 1
+
+      end
+
+
+    end
+
     describe TestSuite::TestSuiteResult do
 
       let( :options )           { make_opts.merge({ :logger => double().as_null_object }) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -136,6 +136,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gitlab-grit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -338,6 +352,7 @@ files:
 - Rakefile
 - beaker.gemspec
 - bin/beaker
+- history.rb
 - lib/beaker.rb
 - lib/beaker/answers.rb
 - lib/beaker/answers/version20.rb