beaker 3.31.0 → 3.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34dbd998615fd6ab9d882e345bf19b94aa38b085
-  data.tar.gz: 4f472e8f75d72030b3ee87422c4b82e5bd5b4efb
+  metadata.gz: 63718888ab30bc62003ce3294ba8537125384e0f
+  data.tar.gz: 69905b24c7dbbfb1282803f8c9f08c5d7e47b826
 SHA512:
-  metadata.gz: ae8661f6efcb5299680a351f1cff6f8bb4ca51f07d42a7c7601649538a949abf2bc534fa5956ebbeca492500e19bff58e2a5b2a39eb1d3dccdb9433066bb84c2
-  data.tar.gz: '0890f0e10493fe424309af1d539bc1f6879b60c939a97de2b608381a22193353aeba5a328a2d2a1f6ecae0f05fa5c5d99880bf5e07a6623d00002136815db096'
+  metadata.gz: bb3dc383b35d8037283e4b0d9c0b13f9eb84dda48ea235c5bc305b6c71551d792a15e8a6bbc201e398f76da04e8d0bfff18de1b788a8c16838b9eb08a5b8cc76
+  data.tar.gz: 17148bf32c0a504eaa38b62bcc620d6003ed2c952b18a16c54d209aeca8f485b035b9dc5097c1350f626540f1197ffa7c7276a8df3ca09023af4959540be55d1

data/CHANGELOG.md

@@ -11,9 +11,21 @@ Tracking in this Changelog began for this project in version 3.25.0.
 If you're looking for changes from before this, refer to the project's
 git logs & PR history.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/3.31.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/3.32.0...master)
 
-# [3.30.0](https://github.com/puppetlabs/beaker/compare/3.30.0...3.31.0) - 2018-01-22
+# [3.32.0](https://github.com/puppetlabs/beaker/compare/3.31.0...3.32.0) - 2018-02-22
+
+### Changed
+
+- Fully qualify sles ssh restart cmd
+- Deprecated deploy_package_repo methods
+- Configuration of host type in host_prebuilt_steps
+
+### Added
+
+- Added missing beaker options for subcommand passthorugh
+
+# [3.31.0](https://github.com/puppetlabs/beaker/compare/3.30.0...3.31.0) - 2018-01-22
 
 ### Changed
 

data/acceptance/scripts/all_but_host_test.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+top_level=$(git rev-parse --show-toplevel)
+acceptance_test_base="$top_level/acceptance/tests/base"
+
+find $acceptance_test_base -type f -name '*.rb' |
+grep -v host_test.rb |
+awk 'BEGIN {
+  comma_index = 1
+} {
+  if (comma_index == 1) {
+    comma_string = $0
+  } else {
+    comma_string = comma_string "," $0
+  }
+  comma_index = comma_index + 1
+} END {
+  print comma_string
+}'

data/beaker.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.0'
 
   # Documentation dependencies
-  s.add_development_dependency 'yard', '< 0.9.6'
+  s.add_development_dependency 'yard', '~> 0.9.11'
 
   # Run time dependencies
   s.add_runtime_dependency 'minitest', '~> 5.4'

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

@@ -297,6 +297,8 @@ module Beaker
         #                          packaging tools. This can be determined with
         #                          `rake pl:print_build_params` from the packaging
         #                          repo.
+        # @deprecated no longer used in beaker, beaker-puppet, or beaker-pe
+        # @visibility private
         def deploy_package_repo host, path, name, version
           host.deploy_package_repo path, name, version
         end

data/lib/beaker/dsl/patterns.rb

@@ -22,7 +22,7 @@ module Beaker
       # @param [Block] block This method will yield to a block of code passed by the caller
       #
       # @return [Array<Result>, Result, nil] An array of results, a result object, or nil.
-      #   Check {#run_block_on} for more details on this.
+      #   Check {Beaker::Shared::HostManager#run_block_on} for more details on this.
       def block_on hosts_or_filter, opts={}, &block
         block_hosts = nil
         if defined? hosts

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

@@ -171,7 +171,7 @@ module Unix::Exec
     when /el-|centos|fedora|redhat|oracle|scientific|eos/
       exec(Beaker::Command.new("/sbin/service sshd restart"))
     when /sles/
-      exec(Beaker::Command.new("rcsshd restart"))
+      exec(Beaker::Command.new("/usr/sbin/rcsshd restart"))
     when /solaris/
       exec(Beaker::Command.new("svcadm restart svc:/network/ssh:default"))
     when /(free|open)bsd/

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

@@ -227,6 +227,8 @@ module Unix::Pkg
   #
   # @note See {Beaker::DSL::Helpers::HostHelpers#deploy_package_repo} for info on
   #       params
+  # @deprecated no longer used in beaker, beaker-puppet, or beaker-pe
+  # @visibility private
   def deploy_apt_repo(path, name, version)
     codename = self['platform'].codename
 
@@ -244,6 +246,8 @@ module Unix::Pkg
   #
   # @note See {Beaker::DSL::Helpers::HostHelpers#deploy_package_repo} for info on
   #       params
+  # @deprecated no longer used in beaker, beaker-puppet, or beaker-pe
+  # @visibility private
   def deploy_yum_repo(path, name, version)
     repo_file = "#{path}/rpm/pl-#{name}-#{version}-repos-pe-#{self['platform']}.repo"
     do_scp_to repo_file, "/etc/yum.repos.d/#{name}.repo", {}
@@ -253,6 +257,8 @@ module Unix::Pkg
   #
   # @note See {Beaker::DSL::Helpers::HostHelpers#deploy_package_repo} for info on
   #       params
+  # @deprecated no longer used in beaker, beaker-puppet, or beaker-pe
+  # @visibility private
   def deploy_zyp_repo(path, name, version)
     repo_file = "#{path}/rpm/pl-#{name}-#{version}-repos-pe-#{self['platform']}.repo"
     repo = IniFile.load(repo_file)
@@ -268,6 +274,8 @@ module Unix::Pkg
   #
   # @note See {Beaker::DSL::Helpers::HostHelpers#deploy_package_repo} for info on
   #       params
+  # @deprecated no longer used in beaker, beaker-puppet, or beaker-pe
+  # @visibility private
   def deploy_package_repo(path, name, version)
     if not File.exists? path
       @logger.warn "Was asked to deploy package repository from #{path}, but it doesn't exist!"

data/lib/beaker/host_prebuilt_steps.rb

@@ -558,32 +558,32 @@ module Beaker
 
       block_on host do |host|
         skip_msg = host.skip_set_env?
-        unless skip_msg.nil?
-          logger.debug( skip_msg )
-          next
-        end
-
-        env = construct_env(host, opts)
-        logger.debug("setting local environment on #{host.name}")
-        if host['platform'] =~ /windows/ and host.is_cygwin?
-          env['CYGWIN'] = 'nodosfilewarning'
+        if skip_msg.nil?
+          env = construct_env(host, opts)
+          logger.debug("setting local environment on #{host.name}")
+          if host['platform'] =~ /windows/ and host.is_cygwin?
+            env['CYGWIN'] = 'nodosfilewarning'
+          end
+          host.ssh_permit_user_environment
+          host.ssh_set_user_environment(env)
+        else
+          logger.debug(skip_msg)
         end
-        host.ssh_permit_user_environment()
-
-        host.ssh_set_user_environment(env)
 
         # REMOVE POST BEAKER 3: backwards compatability, do some setup based upon the global type
         # this is the worst and i hate it
         Class.new.extend(Beaker::DSL).configure_type_defaults_on(host)
 
-        #close the host to re-establish the connection with the new sshd settings
-        host.close
+        if skip_msg.nil?
+          #close the host to re-establish the connection with the new sshd settings
+          host.close
 
-        # print out the working env
-        if host.is_powershell?
-          host.exec(Command.new("SET"))
-        else
-          host.exec(Command.new("cat #{host[:ssh_env_file]}"))
+          # print out the working env
+          if host.is_powershell?
+            host.exec(Command.new("SET"))
+          else
+            host.exec(Command.new("cat #{host[:ssh_env_file]}"))
+          end
         end
 
       end

data/lib/beaker/subcommand.rb

@@ -53,6 +53,9 @@ module Beaker
     class_option :'xml-time-order', :type => :boolean, :group => 'Beaker run'
     class_option :'debug-errors', :type => :boolean, :group => 'Beaker run'
     class_option :'exec_manual_tests', :type => :boolean, :group => 'Beaker run'
+    class_option :'test-tag-exclude', :type => :string, :group => 'Beaker run'
+    class_option :'test-tag-and', :type => :string, :group => 'Beaker run'
+    class_option :'test-tag-or', :type => :string, :group => 'Beaker run'
 
     # The following are listed as deprecated in beaker --help, but needed now for
     # feature parity for beaker 3.x.

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.31.0'
+    STRING = '3.32.0'
   end
 end

data/spec/beaker/subcommand_spec.rb

@@ -32,6 +32,76 @@ module Beaker
       end
     end
 
+    context 'ensure that beaker options can be passed through' do
+
+      let (:beaker_options_list) { [
+        'options-file',
+        'helper',
+        'load-path',
+        'tests',
+        'pre-suite',
+        'post-suite',
+        'pre-cleanup',
+        'provision',
+        'preserve-hosts',
+        'root-keys',
+        'keyfile',
+        'timeout',
+        'install',
+        'modules',
+        'quiet',
+        'color',
+        'color-host-output',
+        'log-level',
+        'log-prefix',
+        'dry-run',
+        'fail-mode',
+        'ntp',
+        'repo-proxy',
+        'add-el-extras',
+        'package-proxy',
+        'validate',
+        'collect-perf-data',
+        'parse-only',
+        'tag',
+        'exclude-tags',
+        'xml-time-order',
+        'debug-errors',
+        'exec_manual_tests',
+        'test-tag-exclude',
+        'test-tag-and',
+        'test-tag-or',
+        'xml',
+        'type',
+        'debug',
+      ] }
+
+      let( :yaml_store_mock ) { double('yaml_store_mock') }
+
+      it 'should not error with valid beaker options' do
+        beaker_options_list.each do |option|
+          allow(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE).and_return(yaml_store_mock)
+          allow(yaml_store_mock).to receive(:transaction).and_yield
+          allow(yaml_store_mock).to receive(:[]=).with('provisioned', false)
+          allow(File).to receive(:open)
+          allow_any_instance_of(Beaker::Logger).to receive(:notify).twice
+          expect(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:exist?).and_return(true)
+          expect(SubcommandUtil::SUBCOMMAND_STATE).to receive(:exist?).and_return(true)
+          expect {Beaker::Subcommand.start(['init', '--hosts', 'centos', "--#{option}"])}.to_not output(/ERROR/).to_stderr
+        end
+      end
+
+      it "should error with a bad option here" do
+        allow(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE).and_return(yaml_store_mock)
+        allow(yaml_store_mock).to receive(:transaction).and_yield
+        allow(yaml_store_mock).to receive(:[]=).with('provisioned', false)
+        expect(File).not_to receive(:open)
+        expect(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:exist?).and_return(true)
+        expect(SubcommandUtil::SUBCOMMAND_STATE).to receive(:exist?).and_return(true)
+        expect {Beaker::Subcommand.start(['init', '--hosts', 'centos', '--bad-option'])}.to output(/ERROR/).to_stderr
+      end
+    end
+
     context '#init' do
       let( :cli ) { subcommand.instance_variable_get(:@cli) }
       let( :mock_options ) { {:timestamp => 'noon', :other_key => 'cordite'}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.31.0
+  version: 3.32.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -84,16 +84,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -529,6 +529,7 @@ files:
 - acceptance/pre_suite/pe/install.rb
 - acceptance/pre_suite/subcommands/05_install_ruby.rb
 - acceptance/pre_suite/subcommands/08_install_beaker.rb
+- acceptance/scripts/all_but_host_test.sh
 - acceptance/tests/base/README.md
 - acceptance/tests/base/dsl/helpers/configuration_test.rb
 - acceptance/tests/base/dsl/helpers/hocon_helpers_test.rb
@@ -806,7 +807,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!