beaker 2.10.0 → 2.11.0

data/lib/beaker/command.rb

@@ -148,7 +148,7 @@ module Beaker
         env_array << "#{key.to_s.upcase}=\"#{val}\""
       end
 
-      if host['is_cygwin'].nil? or host['is_cygwin'] == true
+      if not host.is_powershell?
         environment_string = env_array.join(' ')
         "env #{environment_string}"
       else

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

@@ -6,13 +6,22 @@ module Beaker
       #
       module FacterHelpers
 
-        # @!macro common_opts
+        # @!macro [new] common_opts
         #   @param [Hash{Symbol=>String}] opts Options to alter execution.
         #   @option opts [Boolean] :silent (false) Do not produce log output
         #   @option opts [Array<Fixnum>] :acceptable_exit_codes ([0]) An array
         #     (or range) of integer exit codes that should be considered
         #     acceptable.  An error will be thrown if the exit code does not
         #     match one of the values in this list.
+        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all 
+        #     exit codes as passing.
+        #   @option opts [Boolean] :dry_run (false) Do not actually execute any
+        #     commands on the SUT
+        #   @option opts [String] :stdin (nil) Input to be provided during command
+        #     execution on the SUT.
+        #   @option opts [Boolean] :pty (false) Execute this command in a pseudoterminal.
+        #   @option opts [Boolean] :expect_connection_failure (false) Expect this command
+        #     to result in a connection failure, reconnect and continue execution.
         #   @option opts [Hash{String=>String}] :environment ({}) These will be
         #     treated as extra environment variables that should be set before
         #     running the command.

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

@@ -5,17 +5,6 @@ module Beaker
       # for these methods to execute correctly
       module HieraHelpers
 
-        # @!macro common_opts
-        #   @param [Hash{Symbol=>String}] opts Options to alter execution.
-        #   @option opts [Boolean] :silent (false) Do not produce log output
-        #   @option opts [Array<Fixnum>] :acceptable_exit_codes ([0]) An array
-        #     (or range) of integer exit codes that should be considered
-        #     acceptable.  An error will be thrown if the exit code does not
-        #     match one of the values in this list.
-        #   @option opts [Hash{String=>String}] :environment ({}) These will be
-        #     treated as extra environment variables that should be set before
-        #     running the command.
-        
         # Write hiera config file on one or more provided hosts
         #
         # @param[Host, Array<Host>, String, Symbol] host    One or more hosts to act upon,

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

@@ -5,13 +5,22 @@ module Beaker
       # methods do not require puppet to be installed to execute correctly
       module HostHelpers
 
-        # @!macro common_opts
+        # @!macro [new] common_opts
         #   @param [Hash{Symbol=>String}] opts Options to alter execution.
         #   @option opts [Boolean] :silent (false) Do not produce log output
         #   @option opts [Array<Fixnum>] :acceptable_exit_codes ([0]) An array
         #     (or range) of integer exit codes that should be considered
         #     acceptable.  An error will be thrown if the exit code does not
         #     match one of the values in this list.
+        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all 
+        #     exit codes as passing.
+        #   @option opts [Boolean] :dry_run (false) Do not actually execute any
+        #     commands on the SUT
+        #   @option opts [String] :stdin (nil) Input to be provided during command
+        #     execution on the SUT.
+        #   @option opts [Boolean] :pty (false) Execute this command in a pseudoterminal.
+        #   @option opts [Boolean] :expect_connection_failure (false) Expect this command
+        #     to result in a connection failure, reconnect and continue execution.
         #   @option opts [Hash{String=>String}] :environment ({}) These will be
         #     treated as extra environment variables that should be set before
         #     running the command.
@@ -414,11 +423,11 @@ module Beaker
           logger.debug "  Trying command #{max_retries} times."
           logger.debug ".", add_newline=false
 
-          result = on host, command, {:acceptable_exit_codes => (0...127), :silent => !verbose}, &block
+          result = on host, command, {:accept_all_exit_codes => true, :silent => !verbose}, &block
           num_retries = 0
           until desired_exit_codes.include?(result.exit_code)
             sleep retry_interval
-            result = on host, command, {:acceptable_exit_codes => (0...127), :silent => !verbose}, &block
+            result = on host, command, {:accept_all_exit_codes => true, :silent => !verbose}, &block
             num_retries += 1
             logger.debug ".", add_newline=false
             if (num_retries > max_retries)

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

@@ -9,19 +9,27 @@ module Beaker
       # for these methods to execute correctly
       module PuppetHelpers
 
-        # @!macro common_opts
+        # @!macro [new] common_opts
         #   @param [Hash{Symbol=>String}] opts Options to alter execution.
         #   @option opts [Boolean] :silent (false) Do not produce log output
         #   @option opts [Array<Fixnum>] :acceptable_exit_codes ([0]) An array
         #     (or range) of integer exit codes that should be considered
         #     acceptable.  An error will be thrown if the exit code does not
         #     match one of the values in this list.
+        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all 
+        #     exit codes as passing.
+        #   @option opts [Boolean] :dry_run (false) Do not actually execute any
+        #     commands on the SUT
+        #   @option opts [String] :stdin (nil) Input to be provided during command
+        #     execution on the SUT.
+        #   @option opts [Boolean] :pty (false) Execute this command in a pseudoterminal.
+        #   @option opts [Boolean] :expect_connection_failure (false) Expect this command
+        #     to result in a connection failure, reconnect and continue execution.
         #   @option opts [Hash{String=>String}] :environment ({}) These will be
         #     treated as extra environment variables that should be set before
         #     running the command.
         #
 
-
         # Return the name of the puppet user.
         #
         # @param [Host] host One object that acts like a Beaker::Host
@@ -322,7 +330,7 @@ module Beaker
         #
         # @option opts [Boolean]  :expect_changes (false) This option enables
         #                         detailed exit codes and causes a test failure
-  #                         if `puppet --apply` indicates that there were
+        #                         if `puppet --apply` indicates that there were
         #                         no resource changes during its execution.
         #
         # @option opts [Boolean]  :expect_failures (false) This option enables

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

@@ -9,18 +9,6 @@ module Beaker
       # Convenience methods for modifying and reading TrapperKeeper configs
       module TKHelpers
 
-        # @!macro common_opts
-        #   @param [Hash{Symbol=>String}] opts Options to alter execution.
-        #   @option opts [Boolean] :silent (false) Do not produce log output
-        #   @option opts [Array<Fixnum>] :acceptable_exit_codes ([0]) An array
-        #     (or range) of integer exit codes that should be considered
-        #     acceptable.  An error will be thrown if the exit code does not
-        #     match one of the values in this list.
-        #   @option opts [Hash{String=>String}] :environment ({}) These will be
-        #     treated as extra environment variables that should be set before
-        #     running the command.
-        #
-
         # Modify the given TrapperKeeper config file.
         #
         # @param [Host] host  A host object

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

@@ -4,18 +4,6 @@ module Beaker
       # Convenience methods for checking links and moving web content to hosts
       module WebHelpers
 
-        # @!macro common_opts
-        #   @param [Hash{Symbol=>String}] opts Options to alter execution.
-        #   @option opts [Boolean] :silent (false) Do not produce log output
-        #   @option opts [Array<Fixnum>] :acceptable_exit_codes ([0]) An array
-        #     (or range) of integer exit codes that should be considered
-        #     acceptable.  An error will be thrown if the exit code does not
-        #     match one of the values in this list.
-        #   @option opts [Hash{String=>String}] :environment ({}) These will be
-        #     treated as extra environment variables that should be set before
-        #     running the command.
-        #
-
         # Blocks until the port is open on the host specified, returns false
         # on failure
         def port_open_within?( host, port = 8140, seconds = 120 )

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

@@ -121,23 +121,26 @@ module Beaker
               _, module_name = parse_for_modulename( source_path )
             end
 
+            target_path = File.join(target_module_dir, module_name)
+
             opts[:protocol] ||= 'scp'
             case opts[:protocol]
             when 'scp'
               #move to the host
+              logger.debug "Using scp to transfer #{source_path} to #{target_path}"
               scp_to host, source_path, target_module_dir, {:ignore => ignore_list}
               #rename to the selected module name, if not correct
               cur_path = File.join(target_module_dir, source_name)
-              new_path = File.join(target_module_dir, module_name)
-              if (cur_path != new_path)
-                if host.is_cygwin?
-                  on host, "mv #{cur_path} #{new_path}"
+              if (cur_path != target_path)
+                if host.is_powershell?
+                  on host, "move /y #{cur_path} #{target_path}"
                 else
-                  on host, "move /y #{cur_path} #{new_path}"
+                  on host, "mv #{cur_path} #{target_path}"
                 end
               end
             when 'rsync'
-              rsync_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
+              logger.debug "Using rsync to transfer #{source_path} to #{target_path}"
+              rsync_to host, source_path, target_path, {:ignore => ignore_list}
             else
               logger.debug "Unsupported transfer protocol, returning nil"
               nil

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

@@ -92,6 +92,9 @@ module Beaker
         # @param  [Hash{Symbol=>Symbol, String}] opts The options
         # @option opts [String] :pe_dir Default directory or URL to pull PE package from
         #                  (Otherwise uses individual hosts pe_dir)
+        # @option opts [Boolean] :fetch_local_then_push_to_host determines whether
+        #                 you use Beaker as the middleman for this (true), or curl the
+        #                 file from the host (false; default behavior)
         # @api private
         def fetch_pe_on_mac(host, opts)
           path = host['pe_dir'] || opts[:pe_dir]
@@ -107,7 +110,11 @@ module Beaker
             if not link_exists?("#{path}/#{filename}#{extension}")
               raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
             end
-            on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}"
+            if opts[:fetch_local_then_push_to_host]
+              fetch_and_push_pe(host, path, filename, extension)
+            else
+              on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}"
+            end
           end
         end
 
@@ -119,6 +126,9 @@ module Beaker
         #                  (Otherwise uses individual hosts pe_dir)
         # @option opts [String] :pe_ver_win Default PE version to install or upgrade to
         #                  (Otherwise uses individual hosts pe_ver)
+        # @option opts [Boolean] :fetch_local_then_push_to_host determines whether
+        #                 you use Beaker as the middleman for this (true), or curl the
+        #                 file from the host (false; default behavior)
         # @api private
         def fetch_pe_on_windows(host, opts)
           path = host['pe_dir'] || opts[:pe_dir]
@@ -135,11 +145,13 @@ module Beaker
             if not link_exists?("#{path}/#{filename}#{extension}")
               raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
             end
-            if host.is_cygwin?
+            if opts[:fetch_local_then_push_to_host]
+              fetch_and_push_pe(host, path, filename, extension)
+              on host, "cd #{host['working_dir']}; chmod 644 #{filename}#{extension}"
+            elsif host.is_cygwin?
               on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}"
             else
-              on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{path}/#{filename}#{extension}','#{host['wor
-  king_dir']}\\#{filename}#{extension}')")
+              on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{path}/#{filename}#{extension}','#{host['working_dir']}\\#{filename}#{extension}')")
             end
           end
         end
@@ -150,6 +162,9 @@ module Beaker
         # @param  [Hash{Symbol=>Symbol, String}] opts The options
         # @option opts [String] :pe_dir Default directory or URL to pull PE package from
         #                  (Otherwise uses individual hosts pe_dir)
+        # @option opts [Boolean] :fetch_local_then_push_to_host determines whether
+        #                 you use Beaker as the middleman for this (true), or curl the
+        #                 file from the host (false; default behavior)
         # @api private
         def fetch_pe_on_unix(host, opts)
           path = host['pe_dir'] || opts[:pe_dir]
@@ -184,7 +199,14 @@ module Beaker
             else
               unpack = 'tar -xvf -'
               unpack = extension =~ /gz/ ? 'gunzip | ' + unpack  : unpack
-              on host, "cd #{host['working_dir']}; curl #{path}/#{filename}#{extension} | #{unpack}"
+              if opts[:fetch_local_then_push_to_host]
+                fetch_and_push_pe(host, path, filename, extension)
+                command_file_push = 'cat '
+              else
+                command_file_push = "curl #{path}/"
+              end
+              on host, "cd #{host['working_dir']}; #{command_file_push}#{filename}#{extension} | #{unpack}"
+
             end
           end
         end
@@ -199,6 +221,9 @@ module Beaker
         #                  (Otherwise uses individual hosts pe_ver)
         # @option opts [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
         #                  (Otherwise uses individual Windows hosts pe_ver)
+        # @option opts [Boolean] :fetch_local_then_push_to_host determines whether
+        #                 you use Beaker as the middleman for this (true), or curl the
+        #                 file from the host (false; default behavior)
         # @api private
         def fetch_pe(hosts, opts)
           hosts.each do |host|
@@ -240,10 +265,16 @@ module Beaker
         # @option opts [Boolean] :set_console_password Should we set the PE console password in the answers file?  Used during upgrade only.
         # @option opts [Hash<String>] :answers Pre-set answers based upon ENV vars and defaults
         #                             (See {Beaker::Options::Presets.env_vars})
+        # @option opts [Boolean] :fetch_local_then_push_to_host determines whether
+        #                 you use Beaker as the middleman for this (true), or curl the
+        #                 file from the host (false; default behavior)
         #
         # @example
         #  do_install(hosts, {:type => :upgrade, :pe_dir => path, :pe_ver => version, :pe_ver_win =>  version_win})
         #
+        # @note on windows, the +:ruby_arch+ host parameter can determine in addition
+        # to other settings whether the 32 or 64bit install is used
+        #
         # @api private
         #
         def do_install hosts, opts = {}
@@ -272,12 +303,13 @@ module Beaker
               host['dist'] = "puppet-enterprise-#{version}-#{host['platform']}"
             elsif host['platform'] =~ /windows/
               version = host[:pe_ver] || opts['pe_ver_win']
-              should_install_64bit = !(version_is_less(version, '3.4')) && host.is_x86_64? && !host['install_32'] && !opts['install_32']
+              is_config_32 = true == (host['ruby_arch'] == 'x86') || host['install_32'] || opts['install_32']
+              should_install_64bit = !(version_is_less(version, '3.4')) && host.is_x86_64? && !is_config_32
               #only install 64bit builds if
               # - we are on pe version 3.4+
               # - we do not have install_32 set on host
               # - we do not have install_32 set globally
-              if !(version_is_less(version, '4.0'))
+              if !(version_is_less(version, '3.99'))
                 if should_install_64bit
                   host['dist'] = "puppet-agent-#{version}-x64"
                 else
@@ -448,6 +480,9 @@ module Beaker
         #                  (Otherwise uses individual hosts pe_dir)
         # @option opts [String] :pe_ver Default PE version to install
         #                  (Otherwise uses individual hosts pe_ver)
+        # @option opts [Boolean] :fetch_local_then_push_to_host determines whether
+        #                 you use Beaker as the middleman for this (true), or curl the
+        #                 file from the host (false; default behavior)
         # @raise [StandardError] When installation times out
         #
         # @example
@@ -479,7 +514,7 @@ module Beaker
           prev_sleep = 0
           cur_sleep = 1
           while (res.stdout !~ higgs_re) and (attempts < tries)
-            res = on host, "cd #{host['working_dir']}/#{host['dist']} && cat #{host['higgs_file']}", :acceptable_exit_codes => (0..255)
+            res = on host, "cd #{host['working_dir']}/#{host['dist']} && cat #{host['higgs_file']}", :accept_all_exit_codes => true
             attempts += 1
             sleep( cur_sleep )
             prev_sleep = cur_sleep
@@ -512,6 +547,23 @@ module Beaker
           do_higgs_install higgs_host, options
         end
 
+        # Grabs the pe file from a remote host to the machine running Beaker, then
+        # scp's the file out to the host.
+        #
+        # @param [Host] host The host to install on
+        # @param [String] path path to the install file
+        # @param [String] filename the filename of the pe file (without the extension)
+        # @param [String] extension the extension of the pe file
+        # @param [String] local_dir the directory to store the pe file in on
+        #                   the Beaker-running-machine
+        #
+        # @api private
+        # @return nil
+        def fetch_and_push_pe(host, path, filename, extension, local_dir='tmp/pe')
+          fetch_http_file("#{path}", "#{filename}#{extension}", local_dir)
+          scp_to host, "#{local_dir}/#{filename}#{extension}", host['working_dir']
+        end
+
       end
     end
   end

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

@@ -341,13 +341,17 @@ module Beaker
         # @param [Hash{Symbol=>String}] opts An options hash
         # @option opts [String] :version The version of Puppet to install, required
         # @option opts [String] :win_download_url The url to download puppet from
+        #
+        # @note on windows, the +:ruby_arch+ host parameter can determine in addition
+        # to other settings whether the 32 or 64bit install is used
         def install_puppet_from_msi( host, opts )
           #only install 64bit builds if
           # - we are on puppet version 3.7+
           # - we do not have install_32 set on host
           # - we do not have install_32 set globally
           version = opts[:version]
-          if !(version_is_less(version, '3.7')) and host.is_x86_64? and not host['install_32'] and not opts['install_32']
+          is_config_32 = host['ruby_arch'] == 'x86' || host['install_32'] || opts['install_32']
+          if !(version_is_less(version, '3.7')) && host.is_x86_64? && !is_config_32
             host['dist'] = "puppet-#{version}-x64"
           else
             host['dist'] = "puppet-#{version}"
@@ -702,6 +706,10 @@ module Beaker
         # @option opts [String] :copy_dir_external Directory where puppet-agent
         #                       artifact will be pushed to on the external machine
         #                       (default: '/root')
+        #
+        # @note on windows, the +:ruby_arch+ host parameter can determine in addition
+        # to other settings whether the 32 or 64bit install is used
+        #
         # @return nil
         def install_puppetagent_dev_repo( host, opts )
           opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
@@ -721,7 +729,12 @@ module Beaker
           when /^windows$/
             release_path << 'windows'
             onhost_copy_base = '`cygpath -smF 35`/'
-            arch_suffix = arch =~ /64/ ? '64' : '86'
+            is_config_32 = host['ruby_arch'] == 'x86' || host['install_32'] || opts['install_32']
+            should_install_64bit = host.is_x86_64? && !is_config_32
+            # only install 64bit builds if
+            # - we do not have install_32 set on host
+            # - we do not have install_32 set globally
+            arch_suffix = should_install_64bit ? '64' : '86'
             release_file = "puppet-agent-x#{arch_suffix}.msi"
           else
             raise "No repository installation step for #{variant} yet..."

data/lib/beaker/host.rb

@@ -171,7 +171,11 @@ module Beaker
     end
 
     def is_cygwin?
-      self['is_cygwin'] == nil || self['is_cygwin'] == true
+      self.class == Windows::Host
+    end
+
+    def is_powershell?
+      self.class == PSWindows::Host
     end
 
     def platform
@@ -233,130 +237,11 @@ module Beaker
       self[:ip] ||= get_ip
     end
 
-    #Examine the host system to determine the architecture
-    #@return [Boolean] true if x86_64, false otherwise
-    def determine_if_x86_64
-      if is_cygwin?
-        if self[:platform] =~ /osx|solaris/
-          result = exec(Beaker::Command.new("uname -a | grep x86_64"), :acceptable_exit_codes => (0...127))
-          result.exit_code == 0
-        else
-          result = exec(Beaker::Command.new("arch | grep x86_64"), :acceptable_exit_codes => (0...127))
-          result.exit_code == 0
-        end
-      else
-        result = exec(Beaker::Command.new("wmic os get osarchitecture"), :acceptable_exit_codes => (0...127))
-        result.stdout =~ /64/
-      end
-    end
-
     #@return [Boolean] true if x86_64, false otherwise
     def is_x86_64?
       @x86_64 ||= determine_if_x86_64
     end
 
-    # Converts the provided environment file to a new shell script in /etc/profile.d, then sources that file.
-    # This is for sles based hosts.
-    # @param [String] env_file The ssh environment file to read from
-    def mirror_env_to_profile_d env_file
-      if self[:platform] =~ /sles-/
-        @logger.debug("mirroring environment to /etc/profile.d on sles platform host")
-        cur_env = exec(Beaker::Command.new("cat #{env_file}")).stdout
-        shell_env = ''
-        cur_env.each_line do |env_line|
-          shell_env << "export #{env_line}"
-        end
-        #here doc it over
-        exec(Beaker::Command.new("cat << EOF > #{self[:profile_d_env_file]}\n#{shell_env}EOF"))
-        #set permissions
-        exec(Beaker::Command.new("chmod +x #{self[:profile_d_env_file]}"))
-        #keep it current
-        exec(Beaker::Command.new("source #{self[:profile_d_env_file]}"))
-      else
-        #noop
-        @logger.debug("will not mirror environment to /etc/profile.d on non-sles platform host")
-      end
-    end
-
-    #Add the provided key/val to the current ssh environment
-    #@param [String] key The key to add the value to
-    #@param [String] val The value for the key
-    #@example
-    #  host.add_env_var('PATH', '/usr/bin:PATH')
-    def add_env_var key, val
-      key = key.to_s.upcase
-      if self.is_cygwin?
-        env_file = self[:ssh_env_file]
-        escaped_val = Regexp.escape(val).gsub('/', '\/').gsub(';', '\;')
-        #see if the key/value pair already exists
-        if exec(Beaker::Command.new("grep #{key}=.*#{escaped_val} #{env_file}"), :acceptable_exit_codes => (0..255) ).exit_code == 0
-          return #nothing to do here, key value pair already exists
-        #see if the key already exists
-        elsif exec(Beaker::Command.new("grep #{key} #{env_file}"), :acceptable_exit_codes => (0..255) ).exit_code == 0
-          exec(Beaker::SedCommand.new(self['platform'], "s/#{key}=/#{key}=#{escaped_val}:/", env_file))
-        else
-          exec(Beaker::Command.new("echo \"#{key}=#{val}\" >> #{env_file}"))
-        end
-        #update the profile.d to current state
-        #match it to the contents of ssh_env_file
-        mirror_env_to_profile_d(env_file)
-      else #powershell windows
-        #see if the key/value pair already exists
-        result = exec(Beaker::Command.new("set #{key}"), :acceptable_exit_codes => (0..255))
-        subbed_result = result.stdout.chomp
-        if result.exit_code == 0
-          subbed_result = subbed_result.gsub(/#{Regexp.escape(val.gsub(/'|"/, ''))}/, '')
-        end
-        #not present, add it
-        if subbed_result == result.stdout.chomp
-          exec(Beaker::Command.new("setx /M #{key} %#{key}%;#{val}"))
-          exec(Beaker::Command.new("set #{key}=%#{key}%;#{val}"))
-        end
-      end
-    end
-
-    #Return the value of a specific env var
-    #@param [String] key The key to look for
-    #@example
-    #  host.get_env_var('path')
-    def get_env_var key
-      key = key.to_s.upcase
-      exec(Beaker::Command.new("env | grep #{key}"), :acceptable_exit_codes => (0..255)).stdout.chomp
-    end
-
-    #Delete the provided key/val from the current ssh environment
-    #@param [String] key The key to delete the value from
-    #@param [String] val The value to delete for the key
-    #@example
-    #  host.delete_env_var('PATH', '/usr/bin:PATH')
-    def delete_env_var key, val
-      key = key.to_s.upcase
-      if self.is_cygwin?
-        env_file = self[:ssh_env_file]
-        val = Regexp.escape(val).gsub('/', '\/').gsub(';', '\;')
-        #if the key only has that single value remove the entire line
-        exec(Beaker::SedCommand.new(self['platform'], "/#{key}=#{val}$/d", env_file))
-        #value in middle of list
-        exec(Beaker::SedCommand.new(self['platform'], "s/#{key}=\\(.*\\)[;:]#{val}/#{key}=\\1/", env_file))
-        #value in start of list
-        exec(Beaker::SedCommand.new(self['platform'], "s/#{key}=#{val}[;:]/#{key}=/", env_file))
-        #update the profile.d to current state
-        #match it to the contents of ssh_env_file
-        mirror_env_to_profile_d(env_file)
-      else #powershell windows
-        #get the current value of the key
-        result = exec(Beaker::Command.new("set #{key}"), :acceptable_exit_codes => (0..255))
-        subbed_result = result.stdout.chomp
-        if result.exit_code == 0
-          subbed_result = subbed_result.gsub(/#{Regexp.escape(val.gsub(/'|"/, ''))}/, '')
-        end
-        if subbed_result != result
-          #set to the truncated value
-          self.add_env_var(key, subbed_result)
-        end
-      end
-    end
-
     def connection
       @connection ||= SshConnection.connect( reachable_name,
                                              self['user'],
@@ -403,8 +288,10 @@ module Beaker
           end
           if options[:expect_connection_failure] && result.exit_code
             # should have had a connection failure, but didn't
-            # this can happen because of timing issues, so just raise a warning for now
-            @logger.warn "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])}"
+            # wait to see if the connection failure will be generation, otherwise raise error
+            if not connection.wait_for_connection_failure
+              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
           # No, TestCase has the knowledge about whether its failed, checking acceptable
           # exit codes at the host level and then raising...
@@ -418,27 +305,6 @@ module Beaker
       end
     end
 
-    # Recursively remove the path provided
-    # @param [String] path The path to remove
-    def rm_rf path
-      exec(Beaker::Command.new("rm -rf #{path}"))
-    end
-
-    # Create the provided directory structure on the host
-    # @param [String] dir The directory structure to create on the host
-    # @return [Boolean] True, if directory construction succeeded, otherwise False
-    def mkdir_p dir
-      if self.is_cygwin?
-        cmd = "mkdir -p #{dir}"
-      else
-        windows_dirstring = dir.gsub('/','\\')
-        cmd = "if not exist #{windows_dirstring} (md #{windows_dirstring})"
-      end
-
-      result = exec(Beaker::Command.new(cmd), :acceptable_exit_codes => [0, 1])
-      result.exit_code == 0
-    end
-
     # scp files from the localhost to this test host, if a directory is provided it is recursively copied.
     # If the provided source is a directory both the contents of the directory and the directory
     # itself will be copied to the host, if you only want to copy directory contents you will either need to specify
@@ -608,12 +474,12 @@ module Beaker
   end
 
   [
-    'windows',
-    'pswindows',
      'unix',
      'aix',
      'mac',
      'freebsd',
+     'windows',
+     'pswindows',
   ].each do |lib|
     require "beaker/host/#{lib}"
   end