beaker 4.21.0 → 4.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92aa5f010caeb1dc51e07fda6804186857ce5d3d74c9f8391ff3d6f3cd720f7a
-  data.tar.gz: 8c6903944cf9c77f166edec11fe1503085a048f70119456a5680339771564558
+  metadata.gz: d7a6dab8f2bbd3711c1807aa31ef4947cfffb0c80cfe291dfc3261a677c9d618
+  data.tar.gz: 16dc6decc29e71095f4525b7aa3f301bda493a4cf124695bebeefa6cb695f3fa
 SHA512:
-  metadata.gz: bf304b5107c82a834e86fd4123aa36f89ea8933571f35d2abe5cb3a934447f0a4c154fe8006b315cc4a90404c170a42a4a256b2d90542b1f4ad34024ad248601
-  data.tar.gz: c4331359a27c7b880fbd34213983337f0c79374b353d8f5581def07196df83d7ad0209a7694de4ba8989520cc25fe2210f35ade13d048e5290d98e63e8e240eb
+  metadata.gz: 1ad64e24fd5672ff23b86fc601b7a50d0b1f7b048fde2c8f2af5eb45699ab22bbce0dac53ea1dc8ab4bd887279079a6689f74a1748e03206234f100f5ce08b88
+  data.tar.gz: 5d32208fd3bff7fe6cc06482ccbb7407318a54dafc3141765e32baf726913c9f7b9af4421e30217642fa993cbc1bdef239afe530b35cb3986017a5bef346f696

data/CHANGELOG.md

@@ -20,7 +20,53 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
 - Fixed - for any bug fixes.
 - Security - in case of vulnerabilities.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.21.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.23.2...master)
+
+# [4.23.2](https://github.com/puppetlabs/beaker/compare/4.23.1...4.23.2)
+
+### Fixed
+
+- Fixed Beaker's behavior when the `strict_host_key_checking` option is 
+  provided in the SSH config and Net-SSH > 5 is specified. (#1652)
+
+# [4.23.1](https://github.com/puppetlabs/beaker/compare/4.23.0...4.23.1)
+
+### Changed/Removed
+
+- Reversed the quoting changes on Unix from #1644 in favor of only quoting on Windows. (#1650)
+
+# [4.23.0](https://github.com/puppetlabs/beaker/compare/4.22.1...4.23.0)
+
+### Added
+
+- Relaxed dependency on `net-ssh` to `>= 5` to support newer versions. (#1648)
+- `cat` DSL method added. Works on both Unix and Windows hosts. (#1645)
+
+### Changed
+
+- The `mkdir_p` and `mv` commands now double quote their file arguments. (#1644) If you rely on file globbing in these methods or elsewhere, please open an issue on the BEAKER project.
+- Change `reboot` method to use `who -b` for uptime detection (#1643)
+
+### Fixed
+
+- Use Base64 UTF-16LE encoding for commands (#1626)
+- Fix `tmpdir` method for Powershell on Windows (#1645)
+
+# [4.22.1](https://github.com/puppetlabs/beaker/compare/4.22.0...4.22.1)
+
+### Fixed
+
+- Removed single quotes around paths for file operation commands on `Host` https://github.com/puppetlabs/beaker/pull/1642
+
+# [4.22.0](https://github.com/puppetlabs/beaker/compare/4.21.0...4.22.0) - 2020-05-08
+
+### Added
+
+- Host methods chmod and modified_at. ([#1638](https://github.com/puppetlabs/beaker/pull/1638))
+
+### Removed
+
+- Support for EL-5. ([#1639](https://github.com/puppetlabs/beaker/pull/1639)) ([#1640](https://github.com/puppetlabs/beaker/pull/1640))
 
 # [4.21.0](https://github.com/puppetlabs/beaker/compare/4.20.0...4.21.0) - 2020-03-31
 
@@ -43,7 +89,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
 
 ### Changed
 
-- The `wait_time`, `max_connection_tries`, and `uptime_retries` parameters have been added to `Host::Unix::Exec.reboot`. This allows for more fine-grained control over how the reboot is handled. ([#1625](https://github.com/puppetlabs/beaker/pull/1625)) 
+- The `wait_time`, `max_connection_tries`, and `uptime_retries` parameters have been added to `Host::Unix::Exec.reboot`. This allows for more fine-grained control over how the reboot is handled. ([#1625](https://github.com/puppetlabs/beaker/pull/1625))
 
 ### Fixed
 

data/acceptance/tests/base/external_resources_test.rb

@@ -2,7 +2,6 @@ test_name 'External Resources Test' do
   step 'Verify EPEL resources are up and available' do
     def build_url(el_version)
       url_base = options[:epel_url]
-      url_base = options[:epel_url_archive] if el_version == 5
       "#{url_base}/epel-release-latest-#{el_version}.noarch.rpm"
     end
 
@@ -23,11 +22,10 @@ test_name 'External Resources Test' do
       assert_match(/200 OK/, curl_headers_result.stdout, "EPEL #{el_version} should be reachable at #{url}")
     end
 
-    step 'Verify el_version numbers 5,6,7 are found on the epel resource' do
-      [5,6,7].each do |el_version|
+    step 'Verify el_version numbers 6,7,8 are found on the epel resource' do
+      [6,7,8].each do |el_version|
         epel_url_test(el_version)
       end
     end
-
   end
 end

data/beaker.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rb-readline', '~> 0.5.3'
 
   s.add_runtime_dependency 'hocon', '~> 1.0'
-  s.add_runtime_dependency 'net-ssh', '~> 5.0'
+  s.add_runtime_dependency 'net-ssh', '>= 5.0'
   s.add_runtime_dependency 'net-scp', '~> 1.2'
   s.add_runtime_dependency 'inifile', '~> 3.0'
 

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

@@ -550,7 +550,6 @@ module Beaker
           file_contents = nil
 
           split_path = win_ads_path(file_path)
-
           if file_exists_on(host, split_path[:path])
             if host['platform'] =~ /windows/
               file_path.gsub!('/', '\\')

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

@@ -14,10 +14,11 @@ module Beaker
 
         #Determine is a given URL is accessible
         #@param [String] link The URL to examine
-        #@return [Boolean] true if the URL has a '200' HTTP response code, false otherwise
+        #@param [Integer] limit redirect limit, will follow redirects that many times
+        #@return [Boolean] true if the ultimate URL after following redirects (301&302) has a '200' HTTP response code, false otherwise
         #@example
         #  extension = link_exists?("#{URL}.tar.gz") ? ".tar.gz" : ".tar"
-        def link_exists?(link)
+        def link_exists?(link, limit=10)
           begin
             require "net/http"
             require "net/https"
@@ -26,8 +27,12 @@ module Beaker
             http = Net::HTTP.new(url.host, url.port)
             http.use_ssl = (url.scheme == 'https')
             http.verify_mode = (OpenSSL::SSL::VERIFY_NONE)
-            http.start do |http|
-              return http.head(url.request_uri).code == "200"
+            response = http.start { |http| http.head(url.request_uri) }
+            if (['301', '302'].include? response.code) && limit > 0
+              logger.debug("#{__method__} following #{response.code} to #{response['location']}")
+              link_exists?(response['location'], limit - 1)
+            else
+              response.code == "200"
             end
           rescue
             return false

data/lib/beaker/dsl/wrappers.rb

@@ -75,18 +75,14 @@ module Beaker
         Command.new("powershell.exe", ps_args)
       end
 
-      # Convert the provided command string to Base64
+      # Convert the provided command string to Base64 encoded UTF-16LE command
       # @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
+        Base64.strict_encode64(cmd.encode(Encoding::UTF_16LE)).chomp
       end
-
     end
   end
 end

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

@@ -35,4 +35,13 @@ module Mac::Exec
     false
   end
 
+  # Update ModifiedDate on a file
+  # @param [String] file Path to the file
+  # @param [String] timestamp Timestamp to set
+  def modified_at(file, timestamp = nil)
+    require 'date'
+    time = timestamp ? DateTime.parse("#{timestamp}") : DateTime.now
+    timestamp = time.strftime('%Y%m%d%H%M')
+    execute("touch -mt #{timestamp} #{file}")
+  end
 end

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

@@ -37,6 +37,28 @@ module PSWindows::Exec
     execute("move /y #{orig} #{dest}")
   end
 
+  # Update ModifiedDate on a file
+  # @param [String] file Path to the file
+  # @param [String] timestamp Timestamp to set
+  def modified_at(file, timestamp = nil)
+    require 'date'
+    time = timestamp ? DateTime.parse("#{timestamp}") : DateTime.now
+
+    result = execute("powershell Test-Path #{file} -PathType Leaf")
+
+    if result.include? 'False'
+      execute("powershell New-Item -ItemType file #{file}")
+    end
+    execute("powershell (gci #{file}).LastWriteTime = Get-Date " \
+      "-Year '#{time.year}'" \
+      "-Month '#{time.month}'" \
+      "-Day '#{time.day}'" \
+      "-Hour '#{time.hour}'" \
+      "-Minute '#{time.minute}'" \
+      "-Second '#{time.second}'"
+    )
+  end
+
   def path
     'c:/windows/system32;c:/windows'
   end

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

@@ -7,14 +7,23 @@ module PSWindows::File
   end
 
   def tmpdir(name = '')
-    result = exec(powershell('[System.IO.Path]::GetTempPath()'))
-    result.stdout.chomp()
+    tmp_path = exec(powershell('[System.IO.Path]::GetTempPath()')).stdout.chomp()
+
+    if name == ''
+      name = exec(powershell('[System.IO.Path]::GetRandomFileName()')).stdout.chomp()
+    end
+    exec(powershell("New-Item -Path '#{tmp_path}' -Force -Name '#{name}' -ItemType 'directory'"))
+    File.join(tmp_path, name)
   end
 
   def path_split(paths)
     paths.split(';')
   end
 
+  def cat(path)
+    exec(powershell("type #{path}"))
+  end
+
   def file_exist?(path)
     result = exec(Beaker::Command.new("if exist #{path} echo true"), :acceptable_exit_codes => [0, 1])
     result.stdout =~ /true/

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

@@ -2,9 +2,9 @@ module Unix::Exec
   include Beaker::CommandFactory
 
   # Reboots the host, comparing uptime values to verify success
-  # @param [Integer] wait_time How long to wait after sending the reboot 
+  # @param [Integer] wait_time How long to wait after sending the reboot
   #                            command before attempting to check in on the host
-  # @param [Integer] max_connection_tries How many times to retry connecting to 
+  # @param [Integer] max_connection_tries How many times to retry connecting to
   #                            host after reboot. Note that there is an fibbonacci
   #                            backoff when attempting retries so the time spent
   #                            waiting on this can grow quickly.
@@ -12,20 +12,23 @@ module Unix::Exec
   #
   # Will throw an exception RebootFailure if it fails
   def reboot(wait_time=10, max_connection_tries=9, uptime_retries=18)
+    require 'time'
+
     begin
-      original_uptime = exec(Beaker::Command.new("uptime"))
-      original_uptime_str = parse_uptime original_uptime.stdout
-      original_uptime_int = uptime_int original_uptime_str
+      original_boot_time_str = exec(Beaker::Command.new('who -b'), {:max_connection_tries => max_connection_tries, :silent => true}).stdout
+      original_boot_time_line = original_boot_time_str.lines.grep(/boot/).first
 
-      if self['platform'] =~ /solaris/
-        exec(Beaker::Command.new("reboot"), :expect_connection_failure => true)
-      else
-        exec(Beaker::Command.new("/sbin/shutdown -r now"), :expect_connection_failure => true)
-      end
+      raise Beaker::Host::RebootFailure, "Could not find system boot time using 'who -b': #{original_boot_time_str}" unless original_boot_time_line
+
+      original_boot_time = Time.parse(original_boot_time_line)
+
+      exec(Beaker::Command.new('/bin/systemctl reboot -i || reboot || /sbin/shutdown -r now'), :expect_connection_failure => true)
     rescue Beaker::Host::CommandFailure => e
       raise Beaker::Host::RebootFailure, "Command failed when attempting to reboot: #{e.message}"
     rescue RuntimeError => e
       raise Beaker::Host::RebootFailure, "Unexpected exception in reboot: #{e.message}"
+    rescue ArgumentError => e
+      raise Beaker::Host::RebootFailure, "Unable to parse time: #{e.message}"
     end
 
     attempts = 0
@@ -34,18 +37,19 @@ module Unix::Exec
       @logger.debug("Waiting #{wait_time} for host to shut down.")
       sleep wait_time
 
-      #use uptime to check if the host has rebooted
-      current_uptime_exec = exec(Beaker::Command.new("uptime"), {:max_connection_tries => max_connection_tries, :silent => true})
-      current_uptime = current_uptime_exec.stdout
-      current_uptime_str = parse_uptime current_uptime
-      current_uptime_int = uptime_int current_uptime_str
-      unless original_uptime_int > current_uptime_int
-        raise Beaker::Host::RebootFailure, "Uptime did not reset. Reboot appears to have failed." 
+      current_boot_time_str = exec(Beaker::Command.new('who -b'), {:max_connection_tries => max_connection_tries, :silent => true}).stdout
+      current_boot_time = Time.parse(current_boot_time_str.lines.grep(/boot/).first)
+
+      @logger.debug("Original Boot Time: #{original_boot_time}")
+      @logger.debug("Current Boot Time: #{current_boot_time}")
+
+      unless current_boot_time > original_boot_time
+        raise Beaker::Host::RebootFailure, "Boot time did not reset. Reboot appears to have failed."
       end
     rescue Beaker::Host::RebootFailure => e
       attempts += 1
       if attempts < uptime_retries
-        @logger.debug("Uptime did not reset. Will retry #{uptime_retries - attempts} more times.")
+        @logger.debug("Boot time did not reset. Will retry #{uptime_retries - attempts} more times.")
         retry
       else
         raise
@@ -54,6 +58,8 @@ module Unix::Exec
       raise Beaker::Host::RebootFailure, "Command failed when attempting to reboot: #{e.message}"
     rescue RuntimeError => e
       raise Beaker::Host::RebootFailure, "Unexpected exception in reboot: #{e.message}"
+    rescue ArgumentError => e
+      raise Beaker::Host::RebootFailure, "Unable to parse time: #{e.message}"
     end
   end
 
@@ -89,7 +95,7 @@ module Unix::Exec
       return "0 min"
     end
     raise "Couldn't parse uptime: #{uptime}" if result.nil?
-    
+
     result[1].strip.chomp(",")
   end
 
@@ -101,6 +107,16 @@ module Unix::Exec
     (abs ? '/bin/touch' : 'touch') + " #{file}"
   end
 
+  # Update ModifiedDate on a file
+  # @param [String] file Path to the file
+  # @param [String] timestamp Timestamp to set
+  def modified_at(file, timestamp = nil)
+    require 'date'
+    time = timestamp ? DateTime.parse("#{timestamp}") : DateTime.now
+    timestamp = time.strftime('%Y%m%d%H%M')
+    execute("/bin/touch -mt #{timestamp} #{file}")
+  end
+
   def path
     '/bin:/usr/bin'
   end

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

@@ -30,6 +30,10 @@ module Unix::File
     execute("chown #{recursive ? '-R ' : ''}#{user} #{path}")
   end
 
+  def chmod(mod, path, recursive=false)
+    execute("chmod #{recursive ? '-R ' : ''}#{mod} #{path}")
+  end
+
   # Change group ownership of a path
   #
   # @see http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chgrp.html
@@ -54,6 +58,10 @@ module Unix::File
     execute("ls -ld #{path}")
   end
 
+  def cat(path)
+    execute("cat #{path}")
+  end
+
   # Handles any changes needed in a path for SCP
   #
   # @param [String] path File path to SCP to

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

@@ -119,6 +119,25 @@ module Windows::Exec
     false
   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
+    cmd = "mkdir -p \"#{dir}\""
+    result = exec(Beaker::Command.new(cmd), :acceptable_exit_codes => [0, 1])
+    result.exit_code == 0
+  end
+
+  # Move the origin to destination. The destination is removed prior to moving.
+  # @param [String] orig The origin path
+  # @param [String] dest the destination path
+  # @param [Boolean] rm Remove the destination prior to move
+  def mv orig, dest, rm=true
+    rm_rf dest unless !rm
+    execute("mv \"#{orig}\" \"#{dest}\"")
+  end
+
+
   # Determine if cygwin is actually installed on the SUT. Differs from
   # is_cygwin?, which is just a type check for a Windows::Host.
   #

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

@@ -35,6 +35,9 @@ module Windows::File
     super(group, cygpath, recursive)
   end
 
+  # Not needed on windows
+  def chmod(mod, path, recursive=false); end
+
   # (see {Beaker::Host::Unix::File#ls_ld})
   # @note Cygwin's `ls_ld` implementation does not support
   #   windows-, DOS-, or mixed-style paths, only UNIX/POSIX-style.

data/lib/beaker/host_prebuilt_steps.rb

@@ -244,7 +244,7 @@ module Beaker
       report_and_raise(logger, e, "proxy_config")
     end
 
-    #Install EPEL on host or hosts with platform = /el-(5|6|7)/.  Do nothing on host or hosts of other platforms.
+    #Install EPEL on host or hosts with platform = /el-(6|7)/.  Do nothing on host or hosts of other platforms.
     # @param [Host, Array<Host>] host One or more hosts to act upon.  Will use individual host epel_url, epel_arch
     #                                 and epel_pkg before using defaults provided in opts.
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
@@ -258,11 +258,10 @@ module Beaker
       debug_opt = opts[:debug] ? 'vh' : ''
       block_on host do |host|
         case
-        when el_based?(host) && ['5','6','7'].include?(host['platform'].version)
+        when el_based?(host) && ['6','7'].include?(host['platform'].version)
           result = host.exec(Command.new('rpm -qa | grep epel-release'), :acceptable_exit_codes => [0,1])
           if result.exit_code == 1
             url_base = opts[:epel_url]
-            url_base = opts[:epel_url_archive] if host['platform'].version == '5'
             host.install_package_with_rpm("#{url_base}/epel-release-latest-#{host['platform'].version}.noarch.rpm", '--replacepkgs', { :package_proxy => opts[:package_proxy] })
             #update /etc/yum.repos.d/epel.repo for new baseurl
             host.exec(Command.new("sed -i -e 's;#baseurl.*$;baseurl=#{Regexp.escape("#{url_base}/#{host['platform'].version}")}/\$basearch;' /etc/yum.repos.d/epel.repo"))

data/lib/beaker/options/presets.rb

@@ -174,7 +174,6 @@ module Beaker
           :package_proxy          => false,
           :add_el_extras          => false,
           :epel_url               => "http://dl.fedoraproject.org/pub/epel",
-          :epel_url_archive       => 'http://archive.fedoraproject.org/pub/archive/epel',
           :consoleport            => 443,
           :pe_dir                 => '/opt/enterprise/dists',
           :pe_version_file        => 'LATEST',

data/lib/beaker/ssh_connection.rb

@@ -68,6 +68,11 @@ module Beaker
       max_connection_tries = options[:max_connection_tries] || 11
       begin
          @logger.debug "Attempting ssh connection to #{host}, user: #{user}, opts: #{ssh_opts}"
+
+         if ssh_opts.include?(:strict_host_key_checking) && (Net::SSH::Version::CURRENT.major > 5)
+           ssh_opts[:paranoid] = ssh_opts.delete(:strict_host_key_checking)
+         end
+
          Net::SSH.start(host, user, ssh_opts)
       rescue *RETRYABLE_EXCEPTIONS => e
         if try <= max_connection_tries

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.21.0'
+    STRING = '4.23.2'
   end
 end

data/spec/beaker/host/mac/exec_spec.rb

@@ -31,5 +31,15 @@ module Beaker
         expect(instance.selinux_enabled?).to be === false
       end
     end
+
+    describe '#modified_at' do
+      it 'calls execute with touch and timestamp' do
+        time = '190101010000'
+        path = '/path/to/file'
+        expect( instance ).to receive(:execute).with("touch -mt #{time} #{path}").and_return(0)
+
+        instance.modified_at(path, time)
+      end
+    end
   end
 end

data/spec/beaker/host/pswindows/exec_spec.rb

@@ -50,6 +50,38 @@ module Beaker
         expect( instance.mv(origin, destination, false) ).to be === 0
       end
     end
+
+    describe '#modified_at' do
+      before do
+        allow(instance).to receive(:execute).and_return(stdout)
+      end
+
+      context 'file exists' do
+        let(:stdout) { 'True' }
+        it 'sets the modified_at date' do
+          file = 'C:\path\to\file'
+          expect(instance).to receive(:execute).with("powershell Test-Path #{file} -PathType Leaf")
+          expect(instance).to receive(:execute).with(
+            "powershell (gci C:\\path\\to\\file).LastWriteTime = Get-Date -Year '1970'-Month '1'-Day '1'-Hour '0'-Minute '0'-Second '0'"
+          )
+          instance.modified_at(file, '197001010000')
+        end
+      end
+
+      context 'file does not exist' do
+        let(:stdout) { 'False' }
+        it 'creates it and sets the modified_at date' do
+          file = 'C:\path\to\file'
+          expect(instance).to receive(:execute).with("powershell Test-Path #{file} -PathType Leaf")
+          expect(instance).to receive(:execute).with("powershell New-Item -ItemType file #{file}")
+          expect(instance).to receive(:execute).with(
+            "powershell (gci C:\\path\\to\\file).LastWriteTime = Get-Date -Year '1970'-Month '1'-Day '1'-Hour '0'-Minute '0'-Second '0'"
+          )
+          instance.modified_at(file, '197001010000')
+        end
+      end
+    end
+
     describe '#environment_string' do
       let(:host) { {'pathseparator' => ':'} }
 

data/spec/beaker/host/pswindows/file_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+module Beaker
+  describe PSWindows::File do
+    class PSWindowsFileTest
+      include PSWindows::File
+      include Beaker::DSL::Wrappers
+
+      def initialize(hash, logger)
+        @hash = hash
+        @logger = logger
+      end
+
+      def [](k)
+        @hash[k]
+      end
+
+      def to_s
+        "me"
+      end
+    end
+
+    let (:opts)     { @opts || {} }
+    let (:logger)   { double( 'logger' ).as_null_object }
+    let (:instance) { PSWindowsFileTest.new(opts, logger) }
+
+    describe '#cat' do
+      it 'reads output for file' do
+        path = '/path/to/delete'
+        expect(instance).to receive(:exec)
+        expect(Beaker::Command).to receive(:new).with('powershell.exe', array_including("-Command type #{path}"))
+        instance.cat(path)
+      end
+    end
+
+    describe '#tmpdir' do
+      let(:tmp_path) { 'C:\\tmpdir\\' }
+      let(:fake_command) { Beaker::Command.new('command1') }
+
+      before do
+        allow(instance).to receive(:execute).with(anything)
+
+      end
+
+      context 'with dirname sent' do
+        let(:name) { 'my_dir' }
+        it 'returns the path to my_dir' do
+          expect(Beaker::Command).to receive(:new).
+            with('powershell.exe', array_including('-Command [System.IO.Path]::GetTempPath()')).
+            and_return(fake_command)
+          expect(instance).to receive(:exec).with(instance_of(Beaker::Command)).and_return(double(stdout: tmp_path))
+
+          expect(Beaker::Command).to receive(:new).
+            with('powershell.exe', array_including("-Command New-Item -Path '#{tmp_path}' -Force -Name '#{name}' -ItemType 'directory'")).
+            and_return(fake_command)
+          expect(instance).to receive(:exec).with(instance_of(Beaker::Command)).and_return(true)
+
+          expect(instance.tmpdir(name)).to eq(File.join(tmp_path, name))
+        end
+      end
+
+      context 'without dirname sent' do
+        let(:name) { '' }
+        let(:random_dir) { 'dirname' }
+
+        it 'returns the path to random name dir' do
+          expect(Beaker::Command).to receive(:new).
+            with('powershell.exe', array_including('-Command [System.IO.Path]::GetTempPath()')).
+            and_return(fake_command)
+          expect(instance).to receive(:exec).with(instance_of(Beaker::Command)).and_return(double(stdout: tmp_path))
+
+          expect(Beaker::Command).to receive(:new).
+            with('powershell.exe', array_including('-Command [System.IO.Path]::GetRandomFileName()')).
+            and_return(fake_command)
+          expect(instance).to receive(:exec).with(instance_of(Beaker::Command)).and_return(double(stdout: random_dir))
+
+          expect(Beaker::Command).to receive(:new).
+            with('powershell.exe', array_including("-Command New-Item -Path '#{tmp_path}' -Force -Name '#{random_dir}' -ItemType 'directory'")).
+            and_return(fake_command)
+          expect(instance).to receive(:exec).with(instance_of(Beaker::Command)).and_return(true)
+
+          expect(instance.tmpdir).to eq(File.join(tmp_path, random_dir))
+        end
+      end
+    end
+  end
+end

data/spec/beaker/host/unix/exec_spec.rb

@@ -51,6 +51,16 @@ module Beaker
       end
     end
 
+    describe '#modified_at' do
+      it 'calls execute with touch and timestamp' do
+        time = '190101010000'
+        path = '/path/to/file'
+        expect( instance ).to receive(:execute).with("/bin/touch -mt #{time} #{path}").and_return(0)
+
+        instance.modified_at(path, time)
+      end
+    end
+
     describe '#environment_string' do
       let(:host) { {'pathseparator' => ':'} }
 
@@ -161,94 +171,135 @@ module Beaker
     describe '#reboot' do
       # no-op response
       let (:response) { double( 'response' ) }
-      let (:uptime_initial_response) { double( 'response' ) }
-      let (:uptime_initial_stdout) { '19:52  up 14 mins, 2 users, load averages: 2.95 4.19 4.31' }
+      let (:boot_time_initial_response) { double( 'response' ) }
 
-      let (:uptime_success_response) { double( 'response' ) }
-      let (:uptime_success_stdout) { '19:52  up 0 mins, 2 users, load averages: 2.95 4.19 4.31' }
+      let (:boot_time_success_response) { double( 'response' ) }
       let (:sleep_time) { 10 }
 
       before :each do
-        # stubs enough to survive the first uptime call & output parsing
+        # stubs enough to survive the first boot_time call & output parsing
         #   note: just stubs input-chain between calls, parsing methods still run
-        allow(Beaker::Command).to receive(:new).with("uptime").and_return(:uptime_command_stub)
-
-        # mock initial uptime call
-        allow(instance).to receive( :exec ).with(:uptime_command_stub).and_return(uptime_initial_response).once
-        allow(uptime_initial_response).to receive(:stdout).and_return(uptime_initial_stdout)
+        allow(Beaker::Command).to receive(:new).with('who -b').and_return(:boot_time_command_stub)
 
-        allow(uptime_success_response).to receive(:stdout).and_return(uptime_success_stdout)
+        allow(boot_time_initial_response).to receive(:stdout).and_return(boot_time_initial_stdout)
+        allow(boot_time_success_response).to receive(:stdout).and_return(boot_time_success_stdout)
 
         allow(instance).to receive(:sleep)
 
-        allow(Beaker::Command).to receive(:new).with("/sbin/shutdown -r now").and_return(:shutdown_command_stub)
+        allow(Beaker::Command).to receive(:new).with("/bin/systemctl reboot -i || reboot || /sbin/shutdown -r now").and_return(:shutdown_command_stub)
       end
 
-      it 'raises a reboot failure when command fails' do
-        expect(instance).not_to receive(:sleep)
-        expect(instance).to receive(:exec).with(:shutdown_command_stub, anything).and_raise(Host::CommandFailure).once
-        expect{ instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Command failed when attempting to reboot: .*/)
-      end
+      context 'new boot time greater than old boot time' do
+        let (:boot_time_initial_stdout) { '      system boot  2020-05-13 03:51' }
+        let (:boot_time_success_stdout) { '      system boot  2020-05-13 03:52' }
 
-      it 'raises a reboot failure when we receive an unexpected error' do
-        expect(instance).not_to receive(:sleep)
-        expect(instance).to receive(:exec).with(:shutdown_command_stub, anything).and_raise(Net::SSH::HostKeyError).once
-        expect { instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Unexpected exception in reboot: .*/)
-      end
+        it 'passes with defaults' do
+          expect(instance).to receive(:sleep).with(sleep_time)
+          # bypass shutdown command itself
+          expect(instance).to receive( :exec ).with(:shutdown_command_stub, anything).and_return(response)
+          # allow the second boot_time and the hash arguments in exec
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_success_response).once
 
-      it 'raises RebootFailure if new uptime is never less than old uptime' do
-        expect(instance).to receive(:sleep).with(sleep_time)
-        # bypass shutdown command itself
-        expect(instance).to receive( :exec ).with(:shutdown_command_stub, anything).and_return(response).once
-        # allow the second uptime and the hash arguments in exec, repeated 18 times by default in order to replicate the previous behavior of the ping based Host.down?
-        expect(instance).to receive( :exec ).with(:uptime_command_stub, anything).and_return(uptime_initial_response).exactly(18).times
+          expect(instance.reboot).to be(nil)
+        end
 
-        expect { instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Uptime did not reset/)
-      end
+        it 'passes with wait_time_parameter' do
+          expect(instance).to receive(:sleep).with(10)
+          # bypass shutdown command itself
+          expect(instance).to receive( :exec ).with(:shutdown_command_stub, anything).and_return(response).once
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
+          # allow the second boot_time and the hash arguments in exec
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_success_response).once
 
-      it 'raises RebootFailure if new uptime is never less than old uptime when the number of retries is changed' do
-        expect(instance).to receive(:sleep).with(sleep_time)
-        # bypass shutdown command itself
-        expect(instance).to receive( :exec ).with(:shutdown_command_stub, anything).and_return(response).once
-        # allow the second uptime and the hash arguments in exec, repeated 10 times by default
-        expect(instance).to receive( :exec ).with(:uptime_command_stub, anything).and_return(uptime_initial_response).exactly(10).times
+          expect(instance.reboot(10)).to be(nil)
+        end
 
-        expect { instance.reboot(wait_time=sleep_time, max_connection_tries=9, uptime_retries=10) }.to raise_error(Beaker::Host::RebootFailure, /Uptime did not reset/)
-      end
+        it 'passes with max_connection_tries parameter' do
+          expect(instance).to receive(:sleep).with(sleep_time)
+          # bypass shutdown command itself
+          expect(instance).to receive( :exec ).with(:shutdown_command_stub, anything).and_return(response).once
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
+          # allow the second boot_time and the hash arguments in exec
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, hash_including(:max_connection_tries => 20)).and_return(boot_time_success_response).once
 
-      it 'passes if new uptime is less than old uptime' do
-        expect(instance).to receive(:sleep).with(sleep_time)
-        # bypass shutdown command itself
-        expect(instance).to receive( :exec ).with(:shutdown_command_stub, anything).and_return(response).once
-        # allow the second uptime and the hash arguments in exec
-        expect(instance).to receive( :exec ).with(:uptime_command_stub, anything).and_return(uptime_success_response).once
+          expect(instance.reboot(sleep_time, 20)).to be(nil)
+        end
 
-        expect(instance.reboot).to be(nil)
+        context 'command errors' do
+          before :each do
+            allow(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
+          end
+
+          it 'raises a reboot failure when command fails' do
+            expect(instance).not_to receive(:sleep)
+            expect(instance).to receive(:exec).with(:shutdown_command_stub, anything).and_raise(Host::CommandFailure).once
+
+            expect{ instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Command failed when attempting to reboot: .*/)
+          end
+
+          it 'raises a reboot failure when we receive an unexpected error' do
+            expect(instance).not_to receive(:sleep)
+            expect(instance).to receive(:exec).with(:shutdown_command_stub, anything).and_raise(Net::SSH::HostKeyError).once
+
+            expect { instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Unexpected exception in reboot: .*/)
+          end
+
+          context 'incorrect time string' do
+            context 'original time' do
+              let (:boot_time_initial_stdout) { 'boot bad' }
+
+              it 'raises a reboot failure' do
+                expect(instance).not_to receive(:sleep)
+
+                expect { instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Unable to parse time: .*/)
+              end
+            end
+
+            context 'current time' do
+              let (:boot_time_success_stdout) { 'boot bad' }
+
+              it 'raises a reboot failure' do
+                expect(instance).to receive(:exec).with(:shutdown_command_stub, anything).and_return(response).once
+                expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
+                # allow the second boot_time and the hash arguments in exec, repeated 10 times by default
+                expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_success_response).once
+
+                expect { instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Unable to parse time: .*/)
+              end
+            end
+          end
+        end
       end
 
-      context 'with wait_time_parameter' do
-        it 'passes if new uptime is less than old uptime' do
-          expect(instance).to receive(:sleep).with(10)
+      context 'new boot time less than old boot time' do
+        let (:boot_time_initial_stdout) { '      system boot  2020-05-13 03:51' }
+        let (:boot_time_success_stdout) { '      system boot  2020-05-13 03:50' }
+
+        it 'raises RebootFailure' do
+          expect(instance).to receive(:sleep).with(sleep_time)
           # bypass shutdown command itself
           expect(instance).to receive( :exec ).with(:shutdown_command_stub, anything).and_return(response).once
-          # allow the second uptime and the hash arguments in exec
-          expect(instance).to receive( :exec ).with(:uptime_command_stub, anything).and_return(uptime_success_response).once
 
-          expect(instance.reboot(10)).to be(nil)
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
+          # allow the second boot_time and the hash arguments in exec, repeated 18 times by default in order to replicate the previous behavior of the ping based Host.down?
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_success_response).exactly(18).times
+
+          expect { instance.reboot }.to raise_error(Beaker::Host::RebootFailure, /Boot time did not reset/)
         end
-      end
 
-      context 'with max_connection_tries parameter' do
-        it 'passes if new uptime is less than old uptime' do
+        it 'raises RebootFailure if the number of retries is changed' do
           expect(instance).to receive(:sleep).with(sleep_time)
           # bypass shutdown command itself
           expect(instance).to receive( :exec ).with(:shutdown_command_stub, anything).and_return(response).once
-          # allow the second uptime and the hash arguments in exec
-          expect(instance).to receive( :exec ).with(:uptime_command_stub, hash_including(:max_connection_tries => 20)).and_return(uptime_success_response).once
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
+          # allow the second boot_time and the hash arguments in exec, repeated 10 times by default
+          expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_success_response).exactly(10).times
 
-          expect(instance.reboot(sleep_time, 20)).to be(nil)
+          expect { instance.reboot(wait_time=sleep_time, max_connection_tries=9, boot_time_retries=10) }.to raise_error(Beaker::Host::RebootFailure, /Boot time did not reset/)
         end
       end
+
     end
 
     describe '#enable_remote_rsyslog' do

data/spec/beaker/host/unix/file_spec.rb

@@ -196,6 +196,36 @@ module Beaker
       end
     end
 
+    describe '#cat' do
+      let (:path) { '/path/to/cat/on' }
+      it 'calls cat for path' do
+        expect( instance ).to receive( :execute ).with( "cat #{path}" ).and_return( 0 )
+        expect( instance.cat( path ) ).to be === 0
+      end
+    end
+
+    describe '#chmod' do
+      context 'not recursive' do
+        it 'calls execute with chmod' do
+          path = '/path/to/file'
+          mod = '+x'
+
+          expect( instance ).to receive(:execute).with("chmod #{mod} #{path}")
+          instance.chmod(mod, path)
+        end
+      end
+
+      context 'recursive' do
+        it 'calls execute with chmod' do
+          path = '/path/to/file'
+          mod = '+x'
+
+          expect( instance ).to receive(:execute).with("chmod -R #{mod} #{path}")
+          instance.chmod(mod, path, true)
+        end
+      end
+    end
+
     describe '#chgrp' do
       let (:group) { 'somegroup' }
       let (:path) { '/path/to/chgrp/on' }

data/spec/beaker/host/windows/exec_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 module Beaker
   describe Windows::Exec do
     class WindowsExecTest
+      include Unix::Exec
       include Windows::Exec
 
       def initialize(hash, logger)
@@ -78,5 +79,22 @@ module Beaker
         expect(instance.cygwin_installed?).to eq(false)
       end
     end
+
+    context 'mv' do
+      let(:origin)      { '/origin/path/of/content' }
+      let(:destination) { '/destination/path/of/content' }
+
+      it 'rm first' do
+        expect( instance ).to receive(:execute).with("rm -rf #{destination}").and_return(0)
+        expect( instance ).to receive(:execute).with("mv \"#{origin}\" \"#{destination}\"").and_return(0)
+        expect( instance.mv(origin, destination) ).to be === 0
+
+      end
+
+      it 'does not rm' do
+         expect( instance ).to receive(:execute).with("mv \"#{origin}\" \"#{destination}\"").and_return(0)
+         expect( instance.mv(origin, destination, false) ).to be === 0
+      end
+    end
   end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -329,33 +329,6 @@ describe Beaker do
   context "add_el_extras" do
     subject { dummy_class.new }
 
-    it 'adds archived extras for el-5 hosts' do
-
-      hosts = make_hosts( { :platform => Beaker::Platform.new('el-5-arch'), :exit_code => 1 }, 2 )
-      hosts[1][:platform] = Beaker::Platform.new('oracle-5-arch')
-
-      expect( Beaker::Command ).to receive( :new ).with(
-        "rpm -qa | grep epel-release"
-      ).exactly( 2 ).times
-      hosts.each do |host|
-        expect(host).to receive( :install_package_with_rpm ).with(
-          "http://archive.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm", "--replacepkgs", {:package_proxy => false}
-        ).once
-      end
-      expect( Beaker::Command ).to receive( :new ).with(
-        "sed -i -e 's;#baseurl.*$;baseurl=http://archive\\.fedoraproject\\.org/pub/archive/epel/5/$basearch;' /etc/yum.repos.d/epel.repo"
-      ).exactly( 2 ).times
-      expect( Beaker::Command ).to receive( :new ).with(
-        "sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo"
-      ).exactly( 2 ).times
-      expect( Beaker::Command ).to receive( :new ).with(
-        "yum clean all && yum makecache"
-      ).exactly( 2 ).times
-
-      subject.add_el_extras( hosts, options )
-
-    end
-
     it 'adds extras for el-6 hosts' do
 
       hosts = make_hosts( { :platform => Beaker::Platform.new('el-6-arch'), :exit_code => 1 }, 4 )

data/spec/beaker/host_spec.rb

@@ -325,7 +325,7 @@ module Beaker
         allow( result ).to receive( :exit_code ).and_return( 0 )
         allow( host ).to receive( :exec ).and_return( result )
 
-        expect( Beaker::Command ).to receive(:new).with("mkdir -p test/test/test")
+        expect( Beaker::Command ).to receive(:new).with("mkdir -p \"test/test/test\"")
         expect( host.mkdir_p('test/test/test') ).to be == true
 
       end
@@ -337,7 +337,7 @@ module Beaker
         allow( result ).to receive( :exit_code ).and_return( 0 )
         allow( host ).to receive( :exec ).and_return( result )
 
-        expect( Beaker::Command ).to receive(:new).with("mkdir -p test/test/test")
+        expect( Beaker::Command ).to receive(:new).with("mkdir -p \"test/test/test\"")
         expect( host.mkdir_p('test/test/test') ).to be == true
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.21.0
+  version: 4.23.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -216,14 +216,14 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -630,6 +630,7 @@ files:
 - spec/beaker/host/mac/user_spec.rb
 - spec/beaker/host/mac_spec.rb
 - spec/beaker/host/pswindows/exec_spec.rb
+- spec/beaker/host/pswindows/file_spec.rb
 - spec/beaker/host/pswindows/user_spec.rb
 - spec/beaker/host/pswindows_spec.rb
 - spec/beaker/host/unix/exec_spec.rb