beaker 1.12.2 → 1.13.0

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

@@ -7,7 +7,7 @@ module Unix::Pkg
     @apt_needs_update = true
   end
 
-  def check_for_package(name)
+  def check_for_command(name)
     result = exec(Beaker::Command.new("which #{name}"), :acceptable_exit_codes => (0...127))
     case self['platform']
     when /solaris-10/
@@ -17,6 +17,27 @@ module Unix::Pkg
     end
   end
 
+  def check_for_package(name)
+    case self['platform']
+      when /sles-/
+        result = exec(Beaker::Command.new("zypper se -i --match-exact #{name}"), :acceptable_exit_codes => (0...127))
+      when /el-4/
+        @logger.debug("Package query not supported on rhel4")
+        return false
+      when /fedora|centos|el-/
+        result = exec(Beaker::Command.new("rpm -q #{name}"), :acceptable_exit_codes => (0...127))
+      when /ubuntu|debian/
+        result = exec(Beaker::Command.new("dpkg -s #{name}"), :acceptable_exit_codes => (0...127))
+      when /solaris-11/
+        result = exec(Beaker::Command.new("pkg info #{name}"), :acceptable_exit_codes => (0...127))
+      when /solaris-10/
+        result = exec(Beaker::Command.new("pkginfo #{name}"), :acceptable_exit_codes => (0...127))
+      else
+        raise "Package #{name} cannot be queried on #{self}"
+    end
+    result.exit_code == 0
+  end
+
   # If apt has not been updated since the last repo deployment it is
   # updated. Otherwise this is a noop
   def update_apt_if_needed

data/lib/beaker/host/windows.rb

@@ -43,6 +43,7 @@ module Windows
         'hieralibdir'       => '`cygpath -w /opt/puppet-git-repos/hiera/lib`',
         'hierapuppetlibdir' => '`cygpath -w /opt/puppet-git-repos/hiera-puppet/lib`',
         # PATH related variables need to be Unix, which cygwin converts
+        'puppetbindir'  => '$( [ -d "/cygdrive/c/Program Files (x86)" ] && echo "/cygdrive/c/Program Files (x86)" || echo "/cygdrive/c/Program Files" )/Puppet Labs/Puppet/bin',
         'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
         'pathseparator'     => ';',
       })

data/lib/beaker/host/windows/pkg.rb

@@ -1,11 +1,16 @@
 module Windows::Pkg
   include Beaker::CommandFactory
 
-  def check_for_package(name)
+  def check_for_command(name)
     result = exec(Beaker::Command.new("which #{name}"), :acceptable_exit_codes => (0...127))
     result.exit_code == 0
   end
 
+  def check_for_package(name)
+    result = exec(Beaker::Command.new("cygcheck #{name}"), :acceptable_exit_codes => (0...127))
+    result.exit_code == 0
+  end
+
   def install_package(name, cmdline_args = '')
     cygwin = ""
     rootdir = ""
@@ -20,7 +25,7 @@ module Windows::Pkg
       cygwin = "setup-x86.exe"
     end
 
-    if not check_for_package(cygwin)
+    if not check_for_command(cygwin)
       execute("curl --retry 5 http://cygwin.com/#{cygwin} -o /cygdrive/c/Windows/System32/#{cygwin}")
     end
     execute("#{cygwin} -q -n -N -d -R #{cmdline_args} #{rootdir} -s http://cygwin.osuosl.org -P #{name}")

data/lib/beaker/host_prebuilt_steps.rb

@@ -8,9 +8,9 @@ module Beaker
     NTPSERVER = 'pool.ntp.org'
     SLEEPWAIT = 5
     TRIES = 5
-    PACKAGES = ['curl']
-    UNIX_PACKAGES = ['ntpdate']
-    SLES_PACKAGES = ['ntp']
+    UNIX_PACKAGES = ['curl', 'ntpdate']
+    WINDOWS_PACKAGES = ['curl']
+    SLES_PACKAGES = ['curl', 'ntp']
     ETC_HOSTS_PATH = "/etc/hosts"
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
     ROOT_KEYS_SCRIPT = "https://raw.githubusercontent.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
@@ -67,9 +67,9 @@ module Beaker
     end
 
     #Validate that hosts are prepared to be used as SUTs, if packages are missing attempt to
-    #install them.  Verifies the presence of {HostPrebuiltSteps::PACKAGES} on all hosts,
-    #{HostPrebuiltSteps::UNIX_PACKAGES} on unix platform hosts and {HostPrebuiltSteps::SLES_PACKAGES}
-    #on sles (SUSE, Enterprise Linux) hosts.
+    #install them.  Verifies the presence of #{HostPrebuiltSteps::UNIX_PACKAGES} on unix platform hosts,
+    #{HostPrebuiltSteps::SLES_PACKAGES} on SUSE platform hosts and {HostPrebuiltSteps::WINDOWS_PACKAGES} on windows
+    #platforms.
     # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
     # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
@@ -78,24 +78,25 @@ module Beaker
       if host.is_a? Array
         host.map { |h| validate_host(h, opts) }
       else
-        PACKAGES.each do |pkg|
-          if not host.check_for_package pkg
-            host.install_package pkg
-          end
-        end
         case
-          when host['platform'] =~ /sles-/
-            SLES_PACKAGES.each do |pkg|
-              if not host.check_for_package pkg
-                host.install_package pkg
-              end
+        when host['platform'] =~ /sles-/
+          SLES_PACKAGES.each do |pkg|
+            if not host.check_for_package pkg
+              host.install_package pkg
+            end
+          end
+        when host['platform'] =~ /windows/
+          WINDOWS_PACKAGES.each do |pkg|
+            if not host.check_for_package pkg
+              host.install_package pkg
             end
-          when host['platform'] !~ /(windows)|(aix)|(solaris)/
-            UNIX_PACKAGES.each do |pkg|
-              if not host.check_for_package pkg
-                host.install_package pkg
-              end
+          end
+        when host['platform'] !~ /aix|solaris|windows|sles-/
+          UNIX_PACKAGES.each do |pkg|
+            if not host.check_for_package pkg
+              host.install_package pkg
             end
+          end
         end
       end
     rescue => e

data/lib/beaker/hypervisor/docker.rb

@@ -32,7 +32,7 @@ module Beaker
         })
 
         @logger.debug("Starting container #{container.id}")
-        container.start({"PublishAllPorts" => true})
+        container.start({"PublishAllPorts" => true, "Privileged" => true})
 
         # Find out where the ssh port is from the container
         ip   = container.json["NetworkSettings"]["Ports"]["22/tcp"][0]["HostIp"]

data/lib/beaker/hypervisor/vagrant.rb

@@ -30,11 +30,24 @@ module Beaker
         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 => \"#{host['netmask'] ||= "255.255.0.0"}\"\n"
+
+        if host['disk_path']
+          v_file << "    v.vm.provider :virtualbox do |vb|\n"
+          v_file << "      vb.name = '#{host.name}'\n"
+          unless File.exist?(host['disk_path'])
+            host['disk_path'] = File.join(host['disk_path'], "#{host.name}.vmdk")
+            v_file << "      vb.customize ['createhd', '--filename', '#{host['disk_path']}', '--size', #{host['disk_size'] ||= 5 * 1024}, '--format', 'vmdk']\n"
+          end
+          v_file << "      vb.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium','#{host['disk_path']}']\n"
+          v_file << "    end\n"
+        end
+
         if /windows/i.match(host['platform'])
           v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389\n"
           v_file << "    v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"
           v_file << "    v.vm.guest = :windows"
         end
+
         v_file << "  end\n"
         @logger.debug "created Vagrantfile for VagrantHost #{host.name}"
       end

data/lib/beaker/junit.xsl

@@ -0,0 +1,268 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:output method="html" indent="yes"/>
+<xsl:decimal-format decimal-separator="." grouping-separator="," />
+
+<xsl:template match="testsuites">
+  <html>
+  <head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <link href="http://maxcdn.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet"/>
+  </head>
+
+  <body>
+    <!-- jQuery 2.1.1 -->
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+    <!-- Latest compiled and minified JavaScript -->
+    <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
+
+    <xsl:variable name="time_format"><xsl:value-of select="'#0.00000'"/></xsl:variable>
+
+    <div class="container-fluid">
+      <div class="page-header">
+        <h1>Beaker <small>Puppet Labs Automated Acceptance Testing System</small></h1>
+      </div>
+
+      <!-- calculate overall stats for this run -->
+      <xsl:variable name="total_tests"><xsl:value-of select="sum(testsuite/@tests)"/></xsl:variable>
+      <xsl:variable name="total_errors"><xsl:value-of select="sum(testsuite/@errors)"/></xsl:variable>
+      <xsl:variable name="total_failures"><xsl:value-of select="sum(testsuite/@failures)"/></xsl:variable>
+      <xsl:variable name="total_time"><xsl:value-of select="sum(testsuite/@time)"/></xsl:variable>
+      <xsl:variable name="total_skip"><xsl:value-of select="sum(testsuite/@skip)"/></xsl:variable>
+      <xsl:variable name="total_pending"><xsl:value-of select="sum(testsuite/@pending)"/></xsl:variable>
+
+      <!-- determine if we overall passed or failed -->
+      <xsl:variable name="total_panel_type">
+        <xsl:choose>
+          <xsl:when test="$total_errors > 0 or $total_failures > 0">danger</xsl:when>
+          <xsl:otherwise>success</xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <!-- create the overall panel with stats, colored correctly based upon results -->
+      <div class="panel panel-{$total_panel_type}">
+        <div class="panel-heading">
+          <div class="panel-title">
+            <div class="row">
+              <div class="col-md-4">
+                <h2>Elapsed Time: <xsl:value-of select="format-number($total_time, $time_format)"/> sec </h2>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-md-4">
+              </div>
+              <div class="col-md-2">
+                <h2>Total: <xsl:value-of select="$total_tests" /> </h2>
+              </div>
+              <div class="col-md-2">
+                <h2>Failed: <xsl:value-of select="$total_errors + $total_failures" /></h2>
+              </div>
+              <div class="col-md-2">
+                <h2>Skipped: <xsl:value-of select="$total_skip" /> </h2>
+              </div>
+              <div class="col-md-2">
+                <h2>Pending: <xsl:value-of select="$total_pending" /> </h2>
+              </div>
+            </div> <!-- row -->
+          </div> <!-- panel-title -->
+        </div> <!--panel-heading -->
+
+      <div class="panel-body">
+        <div class="panel-group" id="accordion_one">
+          <xsl:for-each select="testsuite">
+          <!-- let's loop over the availables test suites -->
+            <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_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_panel_type">
+              <xsl:choose>
+                <xsl:when test="$testsuite_errors > 0 or $testsuite_failures > 0">danger</xsl:when>
+                <xsl:otherwise>success</xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <div class="panel panel-{$testsuite_panel_type}">
+              <div class="panel-heading">
+                <div class="panel-title">
+                  <a data-toggle="collapse" data-parent="#accordion_one" href="#{$testsuite_name_safe}">
+                    <div class="row">
+                      <div class="col-md-2">
+                        <h4><xsl:value-of select="$testsuite_name" /></h4>
+                      </div>
+                      <div class="col-md-4">
+                        <h4>Elapsed Time: <xsl:value-of select="format-number($testsuite_time, $time_format)"/> sec</h4>
+                      </div>
+                    </div>
+                    <div class="row">
+                      <div class="col-md-2">
+                      </div>
+                      <div class="col-md-2">
+                        <h4>Total: <xsl:value-of select="$testsuite_tests" /></h4>
+                      </div>
+                      <div class="col-md-2">
+                        <h4>Failed: <xsl:value-of select="$testsuite_errors + $testsuite_failures" /></h4>
+                      </div>
+                      <div class="col-md-2">
+                        <h4>Skipped: <xsl:value-of select="$testsuite_skip" /></h4>
+                      </div>
+                      <div class="col-md-2">
+                        <h4>Pending: <xsl:value-of select="$testsuite_pending" /></h4>
+                      </div>
+                    </div> <!-- row -->
+                  </a>
+                </div> <!-- panel-title -->
+              </div> <!-- panel-heading -->
+              <div id="{$testsuite_name_safe}" class="panel-collapse collapse">
+                <div class="panel-body">
+                  <div class="panel-group" id="accordion_two">
+                    <div class="panel panel-primary">
+                      <div class="panel-heading">
+                        <h5 class="panel-title">
+                          <a data-toggle="collapse" data-parent="#accordion_two" href="#{$testsuite_name_safe}-properties">
+                            <div class="row">
+                              <div class="col-md-4">
+                                Properties
+                              </div>
+                              <div class="col-md-4">
+                              </div>
+                            </div> <!-- row -->
+                          </a>
+                        </h5> <!-- panel-title -->
+                      </div> <!-- panel-heading -->
+                      <div id="{$testsuite_name_safe}-properties" class="panel-collapse collapse in">
+                        <div class="panel-body" style="height:425px">
+                          <div class="panel panel-info" style="overflow-y: auto">
+                            <div style="overflow-y:scroll; max-height:400px">
+                              <!-- Default panel contents -->
+                              <!-- Table -->
+                              <table class="table">
+                              <xsl:for-each select="properties/property">
+                                <xsl:variable name="property_name"><xsl:value-of select="@name"/></xsl:variable>
+                                <xsl:variable name="property_value"><xsl:value-of select="@value"/></xsl:variable>
+                                <tr>
+                                  <td>
+                                    <xsl:value-of select="$property_name" />
+                                  </td>
+                                  <td>
+                                    <xsl:value-of select="$property_value" />
+                                  </td>
+                                </tr>
+                              </xsl:for-each>
+                              </table>
+                            </div> <!-- overflow div -->
+                          </div> <!-- panel panel-info -->
+                        </div> <!-- panel-body -->
+                      </div> <!-- panel-collapse collapse -->
+                    </div> <!-- panel panel-info -->
+                  <!-- Start: Here are the test cases for a given test suite -->
+                  <xsl:for-each select="testcase">
+                    <xsl:variable name="testcase_name"><xsl:value-of select="@name"/></xsl:variable>
+                    <xsl:variable name="testcase_classname"><xsl:value-of select="@classname"/></xsl:variable>
+                    <xsl:variable name="testcase_fullpath"><xsl:value-of select="concat($testcase_classname, '/', $testcase_name)"/></xsl:variable>
+                    <xsl:variable name="testcase_time"><xsl:value-of select="@time"/></xsl:variable>
+                    <xsl:variable name="testcase_link" select="translate(translate($testcase_fullpath, '/', '_'), '.', '_')" />
+                    <xsl:variable name="testcase_panel_type">
+                      <xsl:choose>
+                        <xsl:when test="failure or error">danger</xsl:when>
+                        <xsl:when test="skip">warning</xsl:when>
+                        <xsl:when test="pending">info</xsl:when>
+                        <xsl:otherwise>success</xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:variable>
+                    <div class="panel panel-{$testcase_panel_type}">
+                      <div class="panel-heading">
+                        <div class="panel-title">
+                          <a data-toggle="collapse" data-parent="#accordion_two" href="#{$testcase_link}">
+                            <div class="row">
+                              <div class="col-md-7">
+                                <h5><xsl:value-of select="$testcase_name" /></h5>
+                              </div>
+                            </div>
+                            <div class="row">
+                              <div class="col-md-1">
+                              </div>
+                              <div class="col-md-7">
+                                <h5>Path: <xsl:value-of select="$testcase_fullpath" /></h5>
+                              </div>
+                              <div class="col-md-4">
+                                <h5>Elapsed Time: <xsl:value-of select="format-number($testcase_time, $time_format)"/> sec</h5>
+                              </div>
+                            </div> <!-- row -->
+                          </a>
+                        </div> <!-- panel-title -->
+                      </div> <!-- panel-heading -->
+                      <div id="{$testcase_link}" class="panel-collapse collapse in">
+                        <div class="panel-body" style="height:425px">
+                          <ul class="nav nav-tabs">
+                            <li class="active"><a href="#tab1" data-toggle="tab">output</a></li>
+                            <xsl:choose>
+                              <xsl:when test="system-err and string(system-err)">
+                                <li><a href="#tab2" data-toggle="tab">stderr</a></li>
+                              </xsl:when>
+                              <xsl:otherwise>
+                                <li class="disabled"><a href="#tab2">stderr</a></li>
+                              </xsl:otherwise>
+                            </xsl:choose>
+                            <xsl:choose>
+                              <xsl:when test="failure">
+                                <li><a href="#tab3" data-toggle="tab">failure</a></li>
+                              </xsl:when>
+                              <xsl:otherwise>
+                                <li class="disabled"><a href="#tab3">failure</a></li>
+                              </xsl:otherwise>
+                            </xsl:choose>
+                          </ul>
+                          <div class="tab-content">
+                            <div class="tab-pane active" id="tab1">
+                              <pre class="pre-scrollable">
+                                <xsl:value-of select="system-out" />
+                              </pre>
+                            </div>
+                            <div class="tab-pane" id="tab2">
+                              <pre class="pre-scrollable">
+                                <xsl:value-of select="system-err" />
+                              </pre>
+                            </div>
+                            <div class="tab-pane" id="tab3">
+                              <div class="panel panel-default">
+                                <div class="panel-heading"><xsl:value-of select="failure/@type" /></div>
+                                  <div class="panel-body">
+                                    <pre class="pre-scrollable">
+                                      <xsl:value-of select="failure/@message" />
+                                    </pre>
+                                  </div>
+                                </div>
+                            </div>
+                          </div> <!-- tab-content -->
+                        </div> <!-- panel-body -->
+                      </div> <!-- panel-collapse collapse -->
+                    </div> <!-- panel panel-default -->
+                  </xsl:for-each>
+                  </div>  <!-- panel-group -->
+                  <!-- Stop: Here are the test cases for a given test suite -->
+                </div> <!-- panel-body -->
+              </div> <!-- panel-collapse collapse -->
+            </div> <!-- panel panel-default -->
+            </xsl:for-each>
+          </div> <!-- panel-group -->
+
+        </div> <!-- panel-body -->
+      </div> <!-- panel panel -->
+    </div> <!-- container -->
+
+  <script type="text/javascript">
+    $('.collapse').collapse()
+  </script>
+  </body>
+
+  </html>
+
+
+</xsl:template>
+</xsl:stylesheet>

data/lib/beaker/logger.rb

@@ -50,6 +50,7 @@ module Beaker
     def initialize(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
       @color = options[:color]
+      @sublog = nil
       case options[:log_level]
       when /debug/i, :debug
         @log_level = :debug
@@ -78,6 +79,8 @@ module Beaker
       case dest
       when IO
         @destinations << dest
+      when StringIO
+        @destinations << dest
       when String
         @destinations << File.open(dest, 'w')
       else
@@ -91,6 +94,8 @@ module Beaker
       case dest
       when IO
         @destinations.delete(dest)
+      when StringIO
+        @destinations.delete(dest)
       when String
         @destinations.delete_if {|d| d.respond_to?(:path) and d.path == dest}
       else
@@ -144,7 +149,7 @@ module Beaker
     # @param args[Array<String>] Strings to be reported
     def debug *args
       return unless is_verbose?
-      optionally_color WHITE, args
+      optionally_color WHITE, *args
     end
 
     # Report a warning message.
@@ -162,14 +167,14 @@ module Beaker
     # @param args[Array<String>] Strings to be reported
     def info *args
       return unless is_info?
-      optionally_color BLUE, args
+      optionally_color BLUE, *args
     end
 
     # Report a success message.
     # Will always be reported.
     # @param args[Array<String>] Strings to be reported
     def success *args
-      optionally_color GREEN, args
+      optionally_color GREEN, *args
     end
 
     # Report a notify message.
@@ -177,14 +182,14 @@ module Beaker
     # @param args[Array<String>] Strings to be reported
     def notify *args
       return unless is_notify?
-      optionally_color BRIGHT_WHITE, args
+      optionally_color BRIGHT_WHITE, *args
     end
 
     # Report an error message.
     # Will always be reported.
     # @param args[Array<String>] Strings to be reported
     def error *args
-      optionally_color BRIGHT_RED, args
+      optionally_color BRIGHT_RED, *args
     end
 
     # Strip any color codes from provided string(s)
@@ -220,6 +225,21 @@ module Beaker
       expand_symlinks( trace ).join "\n"
     end
 
+    # Create a new StringIO log to track the current output
+    def start_sublog
+      if @sublog
+        remove_destination(@sublog)
+      end
+      @sublog = StringIO.new
+      add_destination(@sublog)
+    end
+
+    # Return the contents of the sublog
+    def get_sublog
+      @sublog.rewind
+      @sublog.read
+    end
+
     private
     # Expand each symlink found to its full path
     # Lines are assumed to be in the format "String : Integer"