beaker 3.37.0 → 4.0.0

data/spec/beaker/host_spec.rb

@@ -608,16 +608,14 @@ module Beaker
         @options = { :logger => logger }
         args = [ 'source', 'target', {:ignore => ['.bundle']} ]
 
-        key = host['ssh']['keys']
-        if key.is_a? Array
-          key = key.first
-        end
+        key = host['ssh']['keys'].first
+        expect( File ).to receive( :exist? ).with( key ).and_return true
 
         rsync_args = [ 'source', 'target', ['-az', "-e \"ssh -i #{key} -p 22 -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"] ]
 
         expect( host ).to receive(:reachable_name).and_return('default.ip.address')
 
-        expect( Rsync ).to receive(:run).with( *rsync_args ).and_return(Beaker::Result.new(host, 'output!'))
+        expect( Rsync ).to receive(:run).with( *rsync_args ).and_return(Rsync::Result.new('raw rsync output', 0))
 
         host.do_rsync_to *args
 
@@ -637,8 +635,8 @@ module Beaker
         FileUtils.mkdir_p('/var/folders/v0/')
         FileUtils.touch('/var/folders/v0/centos-64-x6420150625-48025-lu3u86')
         rsync_args = [ 'source', 'target', ['-az', "-e \"ssh -F /var/folders/v0/centos-64-x6420150625-48025-lu3u86 -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"] ]
-        expect(Rsync).to receive(:run).with(*rsync_args).and_return(Beaker::Result.new(host, 'output!'))
-        expect(host.do_rsync_to(*args).cmd).to eq('output!')
+        expect(Rsync).to receive(:run).with(*rsync_args).and_return(Rsync::Result.new('raw rsync output', 0))
+        expect(host.do_rsync_to(*args).success?).to eq(true)
       end
 
       it 'does not use the ssh config file when config does not exist' do
@@ -647,8 +645,8 @@ module Beaker
         args = [ 'source', 'target',
                  {:ignore => ['.bundle']} ]
         rsync_args = [ 'source', 'target', ['-az', "-e \"ssh -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"] ]
-        expect(Rsync).to receive(:run).with(*rsync_args).and_return(Beaker::Result.new(host, 'output!'))
-        expect(host.do_rsync_to(*args).cmd).to eq('output!')
+        expect(Rsync).to receive(:run).with(*rsync_args).and_return(Rsync::Result.new('raw rsync output', 0))
+        expect(host.do_rsync_to(*args).success?).to eq(true)
       end
 
       it "doesn't corrupt :ignore option" do
@@ -657,13 +655,11 @@ module Beaker
         ignore_list = ['.bundle']
         args = ['source', 'target', {:ignore => ignore_list}]
 
-        key = host['ssh']['keys']
-        if key.is_a? Array
-          key = key.first
-        end
+        key = host['ssh']['keys'].first
+        expect( File ).to receive( :exist? ).with( key ).twice.and_return true
 
         rsync_args = ['source', 'target', ['-az', "-e \"ssh -i #{key} -p 22 -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"]]
-        expect(Rsync).to receive(:run).twice.with(*rsync_args).and_return(Beaker::Result.new(host, 'output!'))
+        expect(Rsync).to receive(:run).twice.with(*rsync_args).and_return(Rsync::Result.new('raw rsync output', 0))
 
         host.do_rsync_to *args
         host.do_rsync_to *args

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -9,7 +9,7 @@ module Beaker
 
       it "includes custom hypervisor and call set_ssh_connection_preference" do
         allow(hypervisor).to receive(:set_ssh_connection_preference).with([], hypervisor)
-        expect{ hypervisor.create('custom_hypervisor', [], make_opts() )}.to raise_error(RuntimeError, "Invalid hypervisor: custom_hypervisor")
+        expect{ hypervisor.create('custom_hypervisor', [], make_opts() )}.to raise_error(LoadError, "cannot load such file -- beaker/hypervisor/custom_hypervisor")
       end
 
       it "sets ssh connection preference if connection_preference method is not overwritten" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.37.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -86,6 +86,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: beaker-aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: beaker-abs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: beaker-vmpooler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -282,20 +324,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: beaker-hiera
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: beaker-hostgenerator
   requirement: !ruby/object:Gem::Requirement
@@ -310,146 +338,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: beaker-puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: beaker-docker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: beaker-aws
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: beaker-abs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: beaker-vmpooler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: beaker-google
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: beaker-vagrant
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: beaker-vmware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: beaker-openstack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: beaker-vcloud
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 description: Puppet's accceptance testing harness
 email:
 - delivery@puppet.com
@@ -529,7 +417,6 @@ files:
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-x86_64.repo
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-24-x86_64.repo
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-sles-12-x86_64.repo
-- acceptance/lib/beaker/acceptance/install_utils.rb
 - acceptance/lib/helpers/test_helper.rb
 - acceptance/pre_suite/README.md
 - acceptance/pre_suite/pe/install.rb
@@ -544,7 +431,6 @@ files:
 - acceptance/tests/base/dsl/helpers/host_helpers/backup_the_file_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/check_for_package_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/create_remote_file_test.rb
-- acceptance/tests/base/dsl/helpers/host_helpers/create_tmpdir_on_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/curl_on_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/curl_with_retries_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/deploy_package_repo_test.rb
@@ -560,10 +446,10 @@ files:
 - acceptance/tests/base/dsl/helpers/host_helpers/scp_to_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/shell_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/upgrade_package_test.rb
-- acceptance/tests/base/dsl/install_utils/clone_git_repo_on_test.rb
 - acceptance/tests/base/dsl/platform_tag_confiner_test.rb
 - acceptance/tests/base/dsl/structure_test.rb
 - acceptance/tests/base/external_resources_test.rb
+- acceptance/tests/base/host/file_test.rb
 - acceptance/tests/base/host/group_test.rb
 - acceptance/tests/base/host/host_test.rb
 - acceptance/tests/base/host/packages.rb
@@ -617,6 +503,7 @@ files:
 - docs/how_to/test_arbitrary_beaker_versions.md
 - docs/how_to/the_beaker_dsl.md
 - docs/how_to/upgrade_from_2_to_3.md
+- docs/how_to/upgrade_from_3_to_4.md
 - docs/how_to/use_hocon_helpers.md
 - docs/how_to/use_user_password_authentication.md
 - docs/how_to/write_a_beaker_test_for_a_module.md
@@ -638,14 +525,11 @@ files:
 - lib/beaker/dsl.rb
 - lib/beaker/dsl/assertions.rb
 - lib/beaker/dsl/helpers.rb
-- lib/beaker/dsl/helpers/facter_helpers.rb
 - lib/beaker/dsl/helpers/hocon_helpers.rb
 - lib/beaker/dsl/helpers/host_helpers.rb
 - lib/beaker/dsl/helpers/test_helpers.rb
 - lib/beaker/dsl/helpers/web_helpers.rb
 - lib/beaker/dsl/install_utils.rb
-- lib/beaker/dsl/install_utils/pe_defaults.rb
-- lib/beaker/dsl/install_utils/windows_utils.rb
 - lib/beaker/dsl/outcomes.rb
 - lib/beaker/dsl/patterns.rb
 - lib/beaker/dsl/roles.rb
@@ -726,12 +610,9 @@ files:
 - spec/beaker/cli_spec.rb
 - spec/beaker/command_spec.rb
 - spec/beaker/dsl/assertions_spec.rb
-- spec/beaker/dsl/ezbake_utils_spec.rb
 - spec/beaker/dsl/helpers/host_helpers_spec.rb
 - spec/beaker/dsl/helpers/test_helpers_spec.rb
 - spec/beaker/dsl/helpers/web_helpers_spec.rb
-- spec/beaker/dsl/install_utils/pe_defaults_spec.rb
-- spec/beaker/dsl/install_utils/windows_utils_spec.rb
 - spec/beaker/dsl/outcomes_spec.rb
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb
@@ -754,6 +635,7 @@ files:
 - spec/beaker/host/unix/pkg_spec.rb
 - spec/beaker/host/unix_spec.rb
 - spec/beaker/host/windows/exec_spec.rb
+- spec/beaker/host/windows/file_spec.rb
 - spec/beaker/host/windows/group_spec.rb
 - spec/beaker/host/windows/pkg_spec.rb
 - spec/beaker/host/windows/user_spec.rb

data/acceptance/lib/beaker/acceptance/install_utils.rb

@@ -1,58 +0,0 @@
-module Beaker
-  module Acceptance
-    module InstallUtils
-
-      PLATFORM_PATTERNS = {
-        :redhat        => /fedora|el|centos/,
-        :debian        => /debian|ubuntu/,
-        :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
-        :solaris_10    => /solaris-10/,
-        :solaris_11    => /solaris-11/,
-        :windows       => /windows/,
-        :sles          => /sles/,
-      }.freeze
-
-      # Installs packages on the hosts.
-      #
-      # @param hosts [Array<Host>] Array of hosts to install packages to.
-      # @param package_hash [Hash{Symbol=>Array<String,Array<String,String>>}]
-      #   Keys should be a symbol for a platform in PLATFORM_PATTERNS.  Values
-      #   should be an array of package names to install, or of two element
-      #   arrays where a[0] is the command we expect to find on the platform
-      #   and a[1] is the package name (when they are different).
-      # @param options [Hash{Symbol=>Boolean}]
-      # @option options [Boolean] :check_if_exists First check to see if
-      #   command is present before installing package.  (Default false)
-      # @return true
-      def install_packages_on(hosts, package_hash, options = {})
-        return true if hosts == nil
-        check_if_exists = options[:check_if_exists]
-        hosts = [hosts] unless hosts.kind_of?(Array)
-        hosts.each do |host|
-          package_hash.each do |platform_key,package_list|
-            if pattern = PLATFORM_PATTERNS[platform_key]
-              if pattern.match(host['platform'])
-                package_list.each do |cmd_pkg|
-                  if cmd_pkg.kind_of?(Array)
-                    command, package = cmd_pkg
-                  else
-                    command = package = cmd_pkg
-                  end
-                  if !check_if_exists || !host.check_for_package(command)
-                    host.logger.notify("Installing #{package}")
-                    additional_switches = '--allow-unauthenticated' if platform_key == :debian
-                    host.install_package(package, additional_switches)
-                  end
-                end
-              end
-            else
-              raise("Unknown platform '#{platform_key}' in package_hash")
-            end
-          end
-        end
-        return true
-      end
-
-    end
-  end
-end

data/acceptance/tests/base/dsl/helpers/host_helpers/create_tmpdir_on_test.rb

@@ -1,68 +0,0 @@
-require "helpers/test_helper"
-
-test_name "dsl::helpers::host_helpers #create_tmpdir_on" do
-
-  # NOTE: there does not seem to be a reliable way to confine to cygwin hosts.
-  confine_block :to, :platform => /windows/ do
-
-    step "#create_tmpdir_on CURRENTLY fails when attempting to chown the created tempdir to the host user + group, on windows platforms" do
-      # NOTE: would have expected this to work.
-      # TODO: fix via https://tickets.puppetlabs.com/browse/BKR-496
-
-      assert_raises Beaker::Host::CommandFailure do
-        tmpdir = create_tmpdir_on default
-      end
-    end
-  end
-
-  confine_block :to, :platform => /osx/ do
-
-    step "#create_tmpdir_on CURRENTLY fails when attempting to call getent to check the creating user" do
-      # NOTE: would have expected this to work.
-      # TODO: fix via https://tickets.puppetlabs.com/browse/BKR-496
-
-      assert_raises Beaker::Host::CommandFailure do
-        tmpdir = create_tmpdir_on default
-      end
-    end
-  end
-
-  confine_block :except, :platform => /windows|osx/ do
-
-    step "#create_tmpdir_on chowns the created tempdir to the host user + group" do
-      tmpdir = create_tmpdir_on default
-      listing = on(default, "ls -al #{tmpdir}").stdout
-      tmpdir_ls = listing.split("\n").grep %r{\s+\./?\s*$}
-      assert_equal 1, tmpdir_ls.size
-      perms, inodes, owner, group, *rest = tmpdir_ls.first.split(/\s+/)
-      assert_equal default['user'], owner
-      assert_equal default['user'], group
-    end
-
-    step "#create_tmpdir_on returns a temporary directory on the remote system" do
-      tmpdir = create_tmpdir_on default
-      assert_match %r{/}, tmpdir
-      assert_equal 0, on(default, "touch #{tmpdir}/testfile").exit_code
-    end
-
-    step "#create_tmpdir_on uses the specified path prefix when provided" do
-      tmpdir = create_tmpdir_on(default, "mypathprefix")
-      assert_match %r{/mypathprefix}, tmpdir
-      assert_equal 0, on(default, "touch #{tmpdir}/testfile").exit_code
-    end
-
-    step "#create_tmpdir_on fails if a non-existent user is specified" do
-      assert_raises Beaker::Host::CommandFailure do
-        tmpdir = create_tmpdir_on default, '', "fakeuser"
-      end
-    end
-
-    step "#create_tmpdir_on operates on all hosts if given a hosts array" do
-      tmpdirs = create_tmpdir_on hosts
-      hosts.zip(tmpdirs).each do |(host, tmpdir)|
-        assert_match %r{/}, tmpdir
-        assert_equal 0, on(host, "touch #{tmpdir}/testfile").exit_code
-      end
-    end
-  end
-end