beaker 2.25.0 → 2.26.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjM3NjhmMGI2NTg3NDQ3ODViNWRjM2Q3ZTg2MTg0ODQ0NGYzMmIzZg==
+    YzQ4ODE5YmE3ZTJlMmJiY2UxYjgyYjEzYjM2NzYxYTkwNjYzZWRhNg==
   data.tar.gz: !binary |-
-    MDhmOTFkMTVmOTYxN2VlYTEyMzcwZTZlNDYwNTIxM2E1MTk5MTRlNQ==
+    YjRiNzY1ZTEyMTdkYWQwYjAxYWVhY2NiMzE1MzM2ODdmMjEzZTk5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ODM4ODhjYzZiYWI3YmUyYWUwOTk0ZWYwYTI2OTQ5MWIyZjRlMzIyNzk1MDAw
-    ZDA2OTgzZmZjODRlYjM2ZDFkMmVlODc5MzZjOTVlZjNiZmFjZWQ5Y2I5OWU4
-    MTRiMWExYWIwYWRiYmJhOTQ2ZjIwMDk2YjA3N2Q4NzJjOWIyYjU=
+    NDFmOWFiZWMwMjcxOWMwMGQwMzUxMzFiNDU1ZDE0M2E1ZGI4YmI3ZTY3YjZh
+    NjdlYzE5Y2QxZTczMDJmNzI3MTEyZDVmNDExMWQwNGZkYzYxYjY5Y2JhYzVj
+    MWI2NTE2NzdjYmY2OWI3Y2I3NTFjN2VjMDE1YmY5OTNiOGU3YWE=
   data.tar.gz: !binary |-
-    ZWMwN2MxNDIxNDY0YWRkZjYwNzhmMTBmMDdmOWY4NDliNGI4ZmUwYWNkZjUz
-    YTJlMDgyZjQxZWNhYjJlMzk3OTc0ODc2ZjNiYjhmYjg2ZTQ1YzkzZDhjMDZm
-    YTdiMjQ0M2VkOTZkM2E1MWUyZTYxOTM2NTI0MWEyNmE4MmNiYWU=
+    NjViMjNhMDc1MDVhZTY5MThlNjQyM2M3ZTE2MDdiOTU4ZmQ0N2U1OGIwYWRj
+    MWMxYjA2NThhMWM0YzU5YjNmNmQ4MDI4OWY0ZTU2NmEzZmI4ZTAzMDc1OTM4
+    NGI0YTQ2NGQ1ODY0M2Q1MzVlMjVjMmM3ZGFkMzBlMzRlM2E3NWI=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 1 Oct, 2015 (e21f5581)](#LATEST)
+* [LATEST - 13 Oct, 2015 (d581b613)](#LATEST)
+* [2.25.0 - 1 Oct, 2015 (51d4cb1a)](#2.25.0)
 * [2.24.0 - 15 Sep, 2015 (c12e9054)](#2.24.0)
 * [2.23.0 - 9 Sep, 2015 (2532324a)](#2.23.0)
 * [2.22.0 - 1 Sep, 2015 (96ec20a7)](#2.22.0)
@@ -97,7 +98,146 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 1 Oct, 2015 (e21f5581)
+### <a name = "LATEST">LATEST - 13 Oct, 2015 (d581b613)
+
+* (GEM) update beaker version to 2.26.0 (d581b613)
+
+* Merge pull request #971 from sschneid/sysprofile (e2c5f6fc)
+
+
+```
+Merge pull request #971 from sschneid/sysprofile
+
+(BKR-580) --collect-perf-data enhancements
+```
+* Merge pull request #980 from johnduarte/patch-sol-pkg-names (4ef4ba07)
+
+
+```
+Merge pull request #980 from johnduarte/patch-sol-pkg-names
+
+(maint) Fix Solaris 11 package name logic
+```
+* Merge pull request #975 from anodelman/win-fix (6a1e14a9)
+
+
+```
+Merge pull request #975 from anodelman/win-fix
+
+(BKR-275) PowerShell Wrapper Does not Handle Quoting
+```
+* (BKR-275) PowerShell Wrapper Does not Handle Quoting (5bffbaa0)
+
+
+```
+(BKR-275) PowerShell Wrapper Does not Handle Quoting
+
+- add spec test coverage for EncodedCommand support in powershell
+  wrapper
+```
+* (maint) Fix Solaris 11 package name logic (fcbd6018)
+
+
+```
+(maint) Fix Solaris 11 package name logic
+
+This commit fixes a bug in the Solaris 11 package naming logic
+that dropped the SHA suffix entirely from the final package name.
+The SHA should be incorporated into the package name.
+
+An additional spec test has been added for the expected package
+name in this circumstance.
+```
+* (BKR-275) PowerShell Wrapper Does not Handle Quoting (d364123b)
+
+
+```
+(BKR-275) PowerShell Wrapper Does not Handle Quoting
+
+- add unicode support
+```
+* Merge pull request #968 from anodelman/new-platform (ad037a82)
+
+
+```
+Merge pull request #968 from anodelman/new-platform
+
+(BKR-488) Add support for Windows 10 (x86, x64)
+```
+* (BKR-275) PowerShell Wrapper Does not Handle Quoting (c530b8c5)
+
+
+```
+(BKR-275) PowerShell Wrapper Does not Handle Quoting
+
+- create new powershell dsl helper:
+  execute_powershell_script_on
+  * takes as input a string representing a powershell script
+  * create a file on the host containing the script
+  * executes the script using powershell -File
+- add the ability to execute an encoded powershell string
+  powershell("Set Content -path 'fu.txt', -value 'fu'", {'EncodedCommand => true})
+  * the command will be Base64 encoded for you
+  * bypasses quoting sadness
+```
+* Merge pull request #907 from hamidnazari/master (a28c8cf1)
+
+
+```
+Merge pull request #907 from hamidnazari/master
+
+(BKR-427) Support for Docker Container Names and Container Reuse
+```
+* (BKR-580) Different Debian vs EL crontab differences (a4c78dac)
+
+* (BKR-580) Fix spec tests broken in 9b16bef (3ec3fad0)
+
+* (BKR-580) --collect-perf-data enhancements (c57d4d44)
+
+
+```
+(BKR-580) --collect-perf-data enhancements
+
+* allow --collect-perf-data modes:
+
+'aggressive' (poll every minute)
+'normal' (poll every 10 minutes)
+'none' (do not collect perf data)
+
+If a mode is unspecified, --collect-perf-data will default to 'normal',
+which mimics past behavior.
+
+* allow metric exporting to Graphite:
+
+Set via the HOSTS file, eg:
+
+
+`json
+graphite_server: graphite.example.com
+graphite_perf_data: beaker.perf
+
+`
+```
+* (BKR-427) Added support for Docker container names and container reuse (e8a65c67)
+
+* (BKR-488) Add support for Windows 10 (x86, x64) (5b2918db)
+
+
+```
+(BKR-488) Add support for Windows 10 (x86, x64)
+
+- improve the 'wait_for_connection_failure' ssh connection method
+  * increase the timeouts
+  * send actual data down the pipe, seems to improve the function of
+    the test
+  * remove 'abort' calls from the code, we can recover and retry
+  * added yard docs
+- add /f to the windows reboot call
+  * forces closure of any open applications
+```
+### <a name = "2.25.0">2.25.0 - 1 Oct, 2015 (51d4cb1a)
+
+* (HISTORY) update beaker history for gem release 2.25.0 (51d4cb1a)
 
 * (GEM) update beaker version to 2.25.0 (e21f5581)
 

data/lib/beaker/cli.rb

@@ -85,7 +85,9 @@ module Beaker
         provision
 
         # Setup perf monitoring if needed
-        @perf = Beaker::Perf.new( @hosts, @options ) if @options[:collect_perf_data]
+        if @options[:collect_perf_data].to_s =~ /(aggressive)|(normal)/
+          @perf = Beaker::Perf.new( @hosts, @options )
+        end
 
         errored = false
 
@@ -101,11 +103,13 @@ module Beaker
           #run post-suite if we are in fail-slow mode
           if @options[:fail_mode].to_s =~ /slow/
             run_suite(:post_suite)
+            @perf.print_perf_info if defined? @perf
           end
           raise e
         else
           #post acceptance on success
           run_suite(:post_suite)
+          @perf.print_perf_info if defined? @perf
         end
       #cleanup phase
       rescue => e
@@ -119,7 +123,6 @@ module Beaker
           preserve_hosts_file
         end
 
-        @perf.print_perf_info if @options[:collect_perf_data]
         print_reproduction_info( :error )
 
         @logger.error "Failed running the test suite."
@@ -139,7 +142,6 @@ module Beaker
         if @logger.is_debug?
           print_reproduction_info( :debug )
         end
-        @perf.print_perf_info if @options[:collect_perf_data]
       end
     end
 

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

@@ -265,6 +265,25 @@ module Beaker
           end
         end
 
+        # Execute a powershell script from file, remote file created from provided string
+        # @note This method uses Tempfile in Ruby's STDLIB as well as {#create_remote_file}.
+        #
+        # @param [Host] hosts One or more hosts (or some object
+        #                                 that responds like
+        #                                 {Beaker::Host#do_scp_from}.
+        # @param [String] powershell_script A string describing a set of powershell actions
+        #
+        # @return [Result] Returns the result of the powershell command execution
+        def execute_powershell_script_on(hosts, powershell_script, opts = {})
+          block_on hosts do |host|
+            script_path = "beaker_powershell_script_#{Time.now.to_i}.ps1"
+            create_remote_file(host, script_path, powershell_script, opts)
+            native_path = script_path.gsub(/\//, "\\")
+            on host, powershell("", {"File" => native_path }), opts
+          end
+
+        end
+
         # Move a local script to a remote host and execute it
         # @note this relies on {#on} and {#scp_to}
         #

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -1182,6 +1182,7 @@ module Beaker
                 component_version.gsub!(/(^-)|(-$)/, '')
                 # Here we strip leading 0 from version components but leave
                 # singular 0 on their own.
+                component_version = component_version.split('-').join('.')
                 component_version = component_version.split('.').map(&:to_i).join('.')
               end
               release_file = "puppet-agent#{solaris_name_conjunction}#{component_version}#{solaris_release_version}#{solaris_revision_conjunction}#{revision}.#{arch}.#{pkg_suffix}"

data/lib/beaker/dsl/wrappers.rb

@@ -1,3 +1,4 @@
+require 'base64'
 module Beaker
   module DSL
     # These are wrappers to equivalent {Beaker::Command} objects
@@ -107,7 +108,7 @@ module Beaker
       # Returns a {Beaker::Command} object for executing powershell commands on a host
       #
       # @param [String]   command   The powershell command to execute
-      # @param [Hash]     args      The commandline paramaeters to be passed to powershell
+      # @param [Hash]     args      The commandline parameters to be passed to powershell
       #
       # @example Setting the contents of a file
       #     powershell("Set-Content -path 'fu.txt' -value 'fu'")
@@ -115,6 +116,12 @@ module Beaker
       # @example Using an alternative execution policy
       #     powershell("Set-Content -path 'fu.txt' -value 'fu'", {'ExecutionPolicy' => 'Unrestricted'})
       #
+      # @example Using an EncodedCommand (defaults to non-encoded)
+      #     powershell("Set Content -path 'fu.txt', -value 'fu'", {'EncodedCommand => true})
+      #
+      # @example executing from a file
+      #     powershell("", {'-File' => '/path/to/file'})
+      #
       # @return [Command]
       def powershell(command, args={})
         ps_opts = {
@@ -124,8 +131,17 @@ module Beaker
           'NoProfile'       => '',
           'NonInteractive'  => ''
         }
+        encoded = false
         ps_opts.merge!(args)
         ps_args = []
+
+        # determine if the command should be encoded
+        if ps_opts.has_key?('EncodedCommand')
+          v = ps_opts.delete('EncodedCommand')
+          # encode the commend if v is true, nil or empty
+          encoded = v || v.eql?('') || v.nil?
+        end
+
         ps_opts.each do |k, v|
           if v.eql?('') or v.nil?
             ps_args << "-#{k}"
@@ -133,10 +149,31 @@ module Beaker
             ps_args << "-#{k} #{v}"
           end
         end
-        ps_args << "-Command #{command}"
+
+        # may not have a command if executing a file
+        if command && !command.empty?
+          if encoded
+            ps_args << "-EncodedCommand #{encode_command(command)}"
+          else
+            ps_args << "-Command #{command}"
+          end
+        end
 
         Command.new("powershell.exe", ps_args)
       end
+
+      # Convert the provided command string to Base64
+      # @param [String] cmd The command to convert to Base64
+      # @return [String] The converted string
+      # @api private
+      def encode_command(cmd)
+        cmd = cmd.chars.to_a.join("\x00").chomp
+        cmd << "\x00" unless cmd[-1].eql? "\x00"
+        # use strict_encode because linefeeds are not correctly handled in our model
+        cmd = Base64.strict_encode64(cmd).chomp
+        cmd
+      end
+
     end
   end
 end

data/lib/beaker/host.rb

@@ -295,7 +295,7 @@ module Beaker
           if options[:expect_connection_failure] && result.exit_code
             # should have had a connection failure, but didn't
             # wait to see if the connection failure will be generation, otherwise raise error
-            if not connection.wait_for_connection_failure
+            if not connection.wait_for_connection_failure(options, output_callback)
               raise CommandFailure,  "Host '#{self}' should have resulted in a connection failure running:\n #{cmdline}\nLast #{@options[:trace_limit]} lines of output were:\n#{result.formatted_output(@options[:trace_limit])}"
             end
           end

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

@@ -129,7 +129,7 @@ module PSWindows::Exec
     else
       val = val.split(/\n/)[0] # only take the first result
       if clean
-        val.gsub(/#{key}=/,'')
+        val.gsub(/#{key}=/i,'')
       else
         val
       end

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

@@ -2,7 +2,7 @@ module Windows::Exec
   include Beaker::CommandFactory
 
   def reboot
-    exec(Beaker::Command.new('shutdown /r /t 0 /d p:4:1 /c "Beaker::Host reboot command issued"'), :expect_connection_failure => true)
+    exec(Beaker::Command.new('shutdown /f /r /t 0 /d p:4:1 /c "Beaker::Host reboot command issued"'), :expect_connection_failure => true)
     # rebooting on windows is sloooooow
     # give it some breathing room before attempting a reconnect
     sleep(40)

data/lib/beaker/hypervisor/docker.rb

@@ -64,11 +64,28 @@ module Beaker
           image_name = image.id
         end
 
-        @logger.debug("Creating container from image #{image_name}")
-        container = ::Docker::Container.create({
+        container_opts = {
           'Image' => image_name,
           'Hostname' => host.name,
-        })
+        }
+
+        unless host['docker_container_name'].nil?
+          @logger.debug("Looking for an existing container called #{host['docker_container_name']}")
+          existing_container = ::Docker::Container.all.select do |container| container.info['Names'].include? "/#{host['docker_container_name']}" end
+
+          # Prepare to use the existing container or else create it
+          if existing_container.any?
+            container = existing_container[0]
+          else
+            container_opts['name'] = host['docker_container_name']
+          end
+        end
+
+        # If the specified container exists, then use it rather creating a new one
+        if container.nil?
+          @logger.debug("Creating container from image #{image_name}")
+          container = ::Docker::Container.create(container_opts)
+        end
 
         @logger.debug("Starting container #{container.id}")
         container.start({"PublishAllPorts" => true, "Privileged" => true})

data/lib/beaker/logger.rb

@@ -248,9 +248,7 @@ module Beaker
     # @param args[Array<String>] Strings to be reported
     def perf_output *args
       return unless is_debug?
-      strings = strip_colors_from args
-      string = strings.join
-      optionally_color MAGENTA, string, false
+      optionally_color MAGENTA, *args
     end
 
     # Report a trace message.

data/lib/beaker/options/command_line_parser.rb

@@ -195,8 +195,14 @@ module Beaker
             @cmd_options[:validate] = bool
           end
 
-          opts.on '--collect-perf-data', 'Use sysstat on linux hosts to collect performance and load data' do
-            @cmd_options[:collect_perf_data] = true
+          opts.on '--collect-perf-data [MODE]',
+                  'Collect SUT performance and load data',
+                  'Possible values:',
+                  'aggressive (poll every minute)',
+                  'normal (poll every 10 minutes)',
+                  'none (do not collect perf data)',
+                  '(default: normal)' do |mode|
+            @cmd_options[:collect_perf_data] = mode || 'normal'
           end
 
           opts.on('--version', 'Report currently running version of beaker' ) do

data/lib/beaker/options/presets.rb

@@ -179,7 +179,7 @@ module Beaker
           :dot_fog                => File.join(ENV['HOME'], '.fog'),
           :ec2_yaml               => 'config/image_templates/ec2.yaml',
           :help                   => false,
-          :collect_perf_data      => false,
+          :collect_perf_data      => 'none',
           :ssh                    => {
                                      :config                => false,
                                      :paranoid              => false,

data/lib/beaker/perf.rb

@@ -46,6 +46,14 @@ module Beaker
         @logger.perf_output("Creating symlink from /etc/sysstat/sysstat.cron to /etc/cron.d")
         host.exec(Command.new('ln -s /etc/sysstat/sysstat.cron /etc/cron.d'),:acceptable_exit_codes => [0,1])
       end
+      if @options[:collect_perf_data] =~ /aggressive/
+        @logger.perf_output("Enabling aggressive sysstat polling")
+        if host['platform'] =~ /debian|ubuntu/
+          host.exec(Command.new('sed -i s/5-55\\\/10/*/ /etc/cron.d/sysstat'))
+        elsif host['platform'] =~ /centos|el|fedora|oracle|redhats|scientific/
+          host.exec(Command.new('sed -i s/*\\\/10/*/ /etc/cron.d/sysstat'))
+        end
+      end
       if host['platform'] =~ PERF_START_PLATFORMS # SLES doesn't need this step
         host.exec(Command.new('service sysstat start'))
       end
@@ -66,10 +74,54 @@ module Beaker
     def get_perf_data(host, perf_start, perf_end)
       @logger.perf_output("Getting perf data for host: " + host)
       if host['platform'] =~ PERF_SUPPORTED_PLATFORMS # All flavours of Linux
-        host.exec(Command.new("sar -A -s #{perf_start.strftime("%H:%M:%S")} -e #{perf_end.strftime("%H:%M:%S")}"),:acceptable_exit_codes => [0,1,2])
+        if not @options[:collect_perf_data] =~ /aggressive/
+          host.exec(Command.new("sar -A -s #{perf_start.strftime("%H:%M:%S")} -e #{perf_end.strftime("%H:%M:%S")}"),:acceptable_exit_codes => [0,1,2])
+        end
+        if (defined? @options[:graphite_server] and not @options[:graphite_server].nil?) and
+           (defined? @options[:graphite_perf_data] and not @options[:graphite_perf_data].nil?)
+          export_perf_data_to_graphite(host)
+        end
       else
         @logger.perf_output("Perf (sysstat) not supported on host: " + host)
       end
     end
+
+    # Send performance report numbers to an external Graphite instance
+    # @param [Host] host The host we are working with
+    # @return [void]  The report is sent to the logging output
+    def export_perf_data_to_graphite(host)
+      @logger.perf_output("Sending data to Graphite server: " + @options[:graphite_server])
+
+      data = JSON.parse(host.exec(Command.new("sadf -j -- -A"),:silent => true).stdout)
+      hostname = host['vmhostname'].split('.')[0]
+
+      data['sysstat']['hosts'].each do |host|
+        host['statistics'].each do |poll|
+          timestamp = DateTime.parse(poll['timestamp']['date'] + ' ' + poll['timestamp']['time']).to_time.to_i
+
+          poll.keys.each do |stat|
+            case stat
+              when 'cpu-load-all'
+                poll[stat].each do |s|
+                  s.keys.each do |k|
+                    next if k == 'cpu'
+
+                    socket = TCPSocket.new(@options[:graphite_server], 2003)
+                    socket.puts "#{@options[:graphite_perf_data]}.#{hostname}.cpu.#{s['cpu']}.#{k} #{s[k]} #{timestamp}"
+                    socket.close
+                  end
+                end
+
+              when 'memory'
+                poll[stat].keys.each do |s|
+                  socket = TCPSocket.new(@options[:graphite_server], 2003)
+                  socket.puts "#{@options[:graphite_perf_data]}.#{hostname}.memory.#{s} #{poll[stat][s]} #{timestamp}"
+                  socket.close
+                end
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/beaker/ssh_connection.rb

@@ -17,8 +17,11 @@ module Beaker
       Errno::ECONNREFUSED,
       Errno::ECONNRESET,
       Errno::ENETUNREACH,
+      Net::SSH::Exception,
       Net::SSH::Disconnect,
       Net::SSH::AuthenticationFailed,
+      Net::SSH::ChannelRequestFailed,
+      Net::SSH::ChannelOpenFailed,
       IOError,
     ]
 
@@ -46,7 +49,7 @@ module Beaker
          @logger.debug "Attempting ssh connection to #{host}, user: #{user}, opts: #{ssh_opts}"
          Net::SSH.start(host, user, ssh_opts)
        rescue *RETRYABLE_EXCEPTIONS => e
-         if try <= 8
+         if try <= 11
            @logger.warn "Try #{try} -- Host #{host} unreachable: #{e.class.name} - #{e.message}"
            @logger.warn "Trying again in #{wait} seconds"
            sleep wait
@@ -103,26 +106,52 @@ module Beaker
       end
     end
 
-    #We expect the connection to close so wait for that to happen
-    def wait_for_connection_failure
+    # Wait for the ssh connection to fail, returns true on connection failure and false otherwise
+    # @param [Hash{Symbol=>String}] options Options hash to control method conditionals
+    # @option options [Boolean] :pty Should we request a terminal when attempting 
+    #                                to send a command over this connection?
+    # @option options [String] :stdin Any input to be sent along with the command
+    # @param [IO] stdout_callback An IO stream to send connection stdout to, defaults to nil
+    # @param [IO] stderr_callback An IO stream to send connection stderr to, defaults to nil
+    # @return [Boolean] true if connection failed, false otherwise
+    def wait_for_connection_failure options = {}, stdout_callback = nil, stderr_callback = stdout_callback
       try = 1
-      last_wait = 0
-      wait = 1
+      last_wait = 2
+      wait = 3
+      command = 'echo echo' #can be run on all platforms (I'm looking at you, windows)
       while try < 11
+        result = Result.new(@hostname, command)
         begin
-          @logger.debug "Waiting for connection failure on #{@hostname} (attempt #{try}, try again in #{wait} second(s))"
+          @logger.notify "Waiting for connection failure on #{@hostname} (attempt #{try}, try again in #{wait} second(s))"
+          @logger.debug("\n#{@hostname} #{Time.new.strftime('%H:%M:%S')}$ #{command}")
           @ssh.open_channel do |channel|
-            channel.exec('') #Just send something down the pipe
-          end
-          loop_tries = 0
-          #loop is actually loop_forver, so let it try 3 times and then quit instead of endless blocking
-          @ssh.loop { loop_tries += 1 ; loop_tries < 4 }
+            request_terminal_for( channel, command ) if options[:pty]
+
+            channel.exec(command) do |terminal, success|
+              raise Net::SSH::Exception.new("FAILED: to execute command on a new channel on #{@hostname}") unless success
+              register_stdout_for terminal, result, stdout_callback
+              register_stderr_for terminal, result, stderr_callback
+              register_exit_code_for terminal, result
+
+              process_stdin_for( terminal, options[:stdin] ) if options[:stdin]
+             end
+           end
+           loop_tries = 0
+           #loop is actually loop_forever, so let it try 3 times and then quit instead of endless blocking
+           @ssh.loop { loop_tries += 1 ; loop_tries < 4 }
         rescue *RETRYABLE_EXCEPTIONS => e
           @logger.debug "Connection on #{@hostname} failed as expected (#{e.class.name} - #{e.message})"
           close #this connection is bad, shut it down
           return true
         end
-        sleep wait
+        slept = 0
+        stdout_callback.call("sleep #{wait} second(s): ")
+        while slept < wait
+          sleep slept
+          stdout_callback.call('.')
+          slept += 1
+        end
+        stdout_callback.call("\n")
         (last_wait, wait) = wait, last_wait + wait
         try += 1
       end
@@ -143,7 +172,7 @@ module Beaker
         request_terminal_for( channel, command ) if options[:pty]
 
         channel.exec(command) do |terminal, success|
-          abort "FAILED: to execute command on a new channel on #{@hostname}" unless success
+          raise Net::SSH::Exception.new("FAILED: to execute command on a new channel on #{@hostname}") unless success
           register_stdout_for terminal, result, stdout_callback
           register_stderr_for terminal, result, stderr_callback
           register_exit_code_for terminal, result
@@ -198,8 +227,8 @@ module Beaker
         if success
           @logger.debug "Allocated a PTY on #{@hostname} for #{command.inspect}"
         else
-          abort "FAILED: could not allocate a pty when requested on " +
-            "#{@hostname} for #{command.inspect}"
+          raise Net::SSH::Exception.new("FAILED: could not allocate a pty when requested on " +
+            "#{@hostname} for #{command.inspect}")
         end
       end
     end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.25.0'
+    STRING = '2.26.0'
   end
 end

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

@@ -1124,6 +1124,7 @@ describe ClassMixedWithDSLInstallUtils do
           ['1.0.1.0000786.477', '1.0.1.786.477'],
           ['1.000000.1.786.477', '1.0.1.786.477'],
           ['-1.0.1.786.477', '1.0.1.786.477'],
+          ['1.2.5-78-gbb3022f', '1.2.5.78.3022'],
           ['1.2.5.38.6813', '1.2.5.38.6813']
       ].each do |val, expected|
 

data/spec/beaker/dsl/wrappers_spec.rb

@@ -72,5 +72,54 @@ describe ClassMixedWithDSLWrappers do
       expect( command.args ).to be === ["-ExecutionPolicy Unrestricted", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command Set-Content -path 'fu.txt' -value 'fu'"]
       expect( command.options ).to be === {}
     end
+
+    it 'should use EncodedCommand when EncodedCommand => true' do
+      cmd = "Set-Content -path 'fu.txt' -value 'fu'"
+      cmd = subject.encode_command(cmd)
+      command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {'EncodedCommand' => true})
+      expect(command.command ).to be === 'powershell.exe'
+      expect( command.args).to be ===  ["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand #{cmd}"]
+      expect( command.options ).to be === {}
+    end
+
+    it 'should use EncodedCommand when EncodedCommand => ""' do
+      cmd = "Set-Content -path 'fu.txt' -value 'fu'"
+      cmd = subject.encode_command(cmd)
+      command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {'EncodedCommand' => ""})
+      expect(command.command ).to be === 'powershell.exe'
+      expect( command.args).to be ===  ["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand #{cmd}"]
+      expect( command.options ).to be === {}
+    end
+
+    it 'should use EncodedCommand when EncodedCommand => nil' do
+      cmd = "Set-Content -path 'fu.txt' -value 'fu'"
+      cmd = subject.encode_command(cmd)
+      command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {'EncodedCommand' => nil})
+      expect(command.command ).to be === 'powershell.exe'
+      expect( command.args).to be ===  ["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand #{cmd}"]
+      expect( command.options ).to be === {}
+    end
+
+    it 'should not use EncodedCommand when EncodedCommand => false' do
+      command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {'EncodedCommand' => false})
+      expect(command.command ).to be === 'powershell.exe'
+      expect( command.args).to be ===  ["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command Set-Content -path 'fu.txt' -value 'fu'"]
+      expect( command.options ).to be === {}
+    end
+
+    it 'should not use EncodedCommand when EncodedCommand not present' do
+      command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'", {})
+      expect(command.command ).to be === 'powershell.exe'
+      expect( command.args).to be ===  ["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command Set-Content -path 'fu.txt' -value 'fu'"]
+      expect( command.options ).to be === {}
+    end
+
+    it 'has no -Command/-EncodedCommand when command is empty' do
+      command = subject.powershell("", {"File" => 'myfile.ps1'})
+      expect(command.command ).to be === 'powershell.exe'
+      expect( command.args).to be ===  ["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-File myfile.ps1"]
+      expect( command.options ).to be === {}
+
+    end
   end
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -39,6 +39,9 @@ module Beaker
       container = double('Docker::Container')
       allow( container ).to receive(:id)
       allow( container ).to receive(:start)
+      allow( container ).to receive(:info).and_return(
+        *(0..2).map { |index| { 'Names' => ["/spec-container-#{index}"] } }
+      )
       allow( container ).to receive(:json).and_return({
         'NetworkSettings' => {
           'IPAddress' => '192.0.2.1',
@@ -162,6 +165,35 @@ module Beaker
         docker.provision
       end
 
+      it 'should create a named container based on the Image (identified by image.id)' do
+        hosts.each_with_index do |host, index|
+          container_name = "spec-container-#{index}"
+          host['docker_container_name'] = container_name
+
+          expect( ::Docker::Container ).to receive(:all).and_return([])
+
+          expect( ::Docker::Container ).to receive(:create).with({
+            'Image' => image.id,
+            'Hostname' => host.name,
+            'name' => container_name,
+          })
+        end
+
+        docker.provision
+      end
+
+      it 'should not create a container if a named one already exists' do
+        hosts.each_with_index do |host, index|
+          container_name = "spec-container-#{index}"
+          host['docker_container_name'] = container_name
+
+          expect( ::Docker::Container ).to receive(:all).and_return([container])
+          expect( ::Docker::Container ).not_to receive(:create)
+        end
+
+        docker.provision
+      end
+
       it 'should start the container' do
         expect( container ).to receive(:start).with({'PublishAllPorts' => true, 'Privileged' => true})
 

data/spec/beaker/options/command_line_parser_spec.rb

@@ -7,7 +7,7 @@ module Beaker
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
       let(:full_opts_in)  {["--hosts", "host.cfg",           "--options", "opts_file", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always",   "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath",     "-m", "module",         "-q",    "--dry-run",       "--no-ntp",    "--repo-proxy",    "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast",  "--no-color", "--no-color-host-output",  "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure",         "--tag", "1,2,3", "--exclude-tag", "4,5,6",        "--xml-time-order"]}
-      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file",  :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :color_host_output=>false, :beaker_version_print=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>true, :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true, :tag_includes => "1,2,3", :tag_excludes => "4,5,6", :xml_time_enabled => true}}
+      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file",  :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :color_host_output=>false, :beaker_version_print=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>"normal", :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true, :tag_includes => "1,2,3", :tag_excludes => "4,5,6", :xml_time_enabled => true}}
       let(:validate_true)  {["--validate"]}
       let(:validate_false) {["--no-validate"]}
       let(:configure_true)  {['--configure']}

data/spec/beaker/perf_spec.rb

@@ -40,7 +40,7 @@ module Beaker
         @my_logger.remove_destination(STDOUT)
         perf = Perf.new( hosts, @options )
         expect( perf ).to be_a_kind_of Perf
-        expect(@my_io.string).to match(/Setup perf on host: myHost*Setup perf on host: myOtherHost/)
+        expect(@my_io.string).to match(/Setup perf on host: myHost*\nSetup perf on host: myOtherHost/)
       end
 
       it 'creates a new Perf object with multiple hosts, :collect_perf_data = true, SLES' do
@@ -50,7 +50,7 @@ module Beaker
         @my_logger.remove_destination(STDOUT)
         perf = Perf.new( hosts, @options )
         expect( perf ).to be_a_kind_of Perf
-        expect(@my_io.string).to match(/Setup perf on host: myHostSetup perf on host: myOtherHost/)
+        expect(@my_io.string).to match(/Setup perf on host: myHost\nSetup perf on host: myOtherHost/)
       end
     end
 
@@ -73,7 +73,7 @@ module Beaker
         perf = Perf.new( @hosts, @options )
         expect( perf ).to be_a_kind_of Perf
         perf.print_perf_info
-        expect(@my_io.string).to match(/Setup perf on host: myHostSetup perf on host: myOtherHostPerf \(sysstat\) not supported on host: myOtherHostGetting perf data for host: myHostGetting perf data for host: myOtherHostPerf \(sysstat\) not supported on host: myOtherHost/)
+        expect(@my_io.string).to match(/Setup perf on host: myHost\nSetup perf on host: myOtherHost\nPerf \(sysstat\) not supported on host: myOtherHost\nGetting perf data for host: myHost\nGetting perf data for host: myOtherHost\nPerf \(sysstat\) not supported on host: myOtherHost/)
       end
 
       it "Does the Right Thing on non-Linux hosts" do
@@ -82,7 +82,7 @@ module Beaker
         perf = Perf.new( @hosts, @options )
         expect( perf ).to be_a_kind_of Perf
         perf.print_perf_info
-        expect(@my_io.string).to match(/Setup perf on host: myHostPerf \(sysstat\) not supported on host: myHostSetup perf on host: myOtherHostPerf \(sysstat\) not supported on host: myOtherHostGetting perf data for host: myHostPerf \(sysstat\) not supported on host: myHostGetting perf data for host: myOtherHostPerf \(sysstat\) not supported on host: myOtherHost/)
+        expect(@my_io.string).to match(/Setup perf on host: myHost\nPerf \(sysstat\) not supported on host: myHost\nSetup perf on host: myOtherHost\nPerf \(sysstat\) not supported on host: myOtherHost\nGetting perf data for host: myHost\nPerf \(sysstat\) not supported on host: myHost\nGetting perf data for host: myOtherHost\nPerf \(sysstat\) not supported on host: myOtherHost/)
       end
     end
 

data/spec/beaker/ssh_connection_spec.rb

@@ -113,7 +113,7 @@ module Beaker
     end
 
     describe '#request_terminal_for' do
-      it 'fails correctly by calling the abort method' do
+      it 'fails correctly by raising Net::SSH::Exception' do
         mock_ssh = Object.new
         expect( Net::SSH ).to receive( :start ).with( ip, user, ssh_opts) { mock_ssh }
         connection.connect
@@ -121,8 +121,7 @@ module Beaker
         mock_channel = Object.new
         allow( mock_channel ).to receive( :request_pty ).and_yield(nil, false)
 
-        expect( subject ).to receive( :abort ).once
-        connection.request_terminal_for mock_channel, 'ls'
+        expect{ connection.request_terminal_for mock_channel, 'ls' }.to raise_error Net::SSH::Exception
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.25.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec