beaker 2.29.1 → 2.30.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDZlMGU2MGNjMGIzZmQxNzkyZjlhZjRhYmE1ODgwZDVlYTQ3ZTE3Yw==
+    M2FjYzE1ZjkzNDBiNTMwOTdjZTFlOTg5OTMzOTgzNDBkMzJlMzRmMA==
   data.tar.gz: !binary |-
-    OGY0NDVlMDJiNTk4Mjg0Mzk4MjVjOTdjN2JlOGI4YmNhNTAwYjRlNQ==
+    OTA5NTY5ZTQ5YWE0OWU2NjVlNDVhMDBjYThiZmEwYTg2ODFiMTM3OA==
 SHA512:
   metadata.gz: !binary |-
-    NTYzNjJjODNkNDE1ZGU1MTYxNTQyMjZhZjM0MTQzZDc5MzQ4ZGM1Nzc4M2Y3
-    YWRkNWRhYjQwMGQyZWU2Y2I3Y2FiN2QxMTI5YTk2NDAzMTUxZDU4NTU3MmQ0
-    NGU0MWJiNzQ2N2JjMTYzMTMxYjQwNzA4NjdjN2ExNGRhOWJiZjY=
+    YmE0NjFmMmU2ZmU5OWMxMTY2YmI2YWUxOGE3MGVjZmNlYzMzNTgxYjg2Zjc5
+    ZTMwZGQ3OWQ5Y2Q5ZTc0NzgzY2M3NGJlZWE0ZTU4NjQxODA0MjdhNGQyNjE5
+    NDY3YTljMzcwYjJlNTgxOGNiMTAwZDc4NjM2MDVmOGY1NzgyODA=
   data.tar.gz: !binary |-
-    ZjFiZmE3NzNiODg0ODgyZTAwMzNjMjhiMmY4YzA5MWU5NWQ1ZjlmZDI5YTY5
-    MWVkY2U4NzZlMGEwNDY2YjU2MmM2NzRhOTEzYzRhOGVmNWMzYjk0N2FhODMx
-    ZWQ0MzQ1MWRlYjFiNGIxMzQ5ZDM5MjllNzMzYzhlY2JjNDk0YjA=
+    ZWJlZmY0NzBlY2Q1ZjYyNDQxMDNmYzg0ZjE0OWE0N2NmMjBjZTVjMmE5OTNh
+    ODhjN2E5ZmYxOTg5ODYyMzQ3NjA5NTkwZDU0MmYxMTMyNTliM2YyNjNiMzUx
+    NzZiOGQ2ZDgyYjYyMWQ2MTc1NDQzOTk2ZTJlNzQ2NGQwZTk4YmM=

data/.gitignore

@@ -8,6 +8,7 @@ Gemfile.lock
 options.rb
 test.cfg
 .yardoc
+yard_docs
 coverage
 .bundle
 .vendor

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 23 Nov, 2015 (5781838d)](#LATEST)
+* [LATEST - 2 Dec, 2015 (bc912e78)](#LATEST)
+* [2.29.1 - 23 Nov, 2015 (5d824690)](#2.29.1)
 * [2.29.0 - 18 Nov, 2015 (33fd2399)](#2.29.0)
 * [2.28.0 - 4 Nov, 2015 (89829551)](#2.28.0)
 * [2.27.0 - 21 Oct, 2015 (0378d13a)](#2.27.0)
@@ -102,7 +103,272 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 23 Nov, 2015 (5781838d)
+### <a name = "LATEST">LATEST - 2 Dec, 2015 (bc912e78)
+
+* (GEM) update beaker version to 2.30.0 (bc912e78)
+
+* Merge pull request #1013 from puppetlabs/bkr-623/test-runner-reorganization (6c613051)
+
+
+```
+Merge pull request #1013 from puppetlabs/bkr-623/test-runner-reorganization
+
+[BKR-623] Reorganize Beaker test runner classes for introduction of minitest runner
+```
+* Merge pull request #1021 from kevpl/yard_gen_fix (5fcdb777)
+
+
+```
+Merge pull request #1021 from kevpl/yard_gen_fix
+
+(MAINT) updated yard doc location
+```
+* Merge pull request #1016 from hunner/add_solaris (1245f155)
+
+
+```
+Merge pull request #1016 from hunner/add_solaris
+
+(BKR-472) (BKR-475) Fix solaris for install_pe_on with 2015.2
+```
+* Merge pull request #1017 from adrienthebo/ruby-193-p194-platform-yaml-deserialize (d4854de2)
+
+
+```
+Merge pull request #1017 from adrienthebo/ruby-193-p194-platform-yaml-deserialize
+
+(BKR-634) Fix YAML deserialization for Beaker::Platform
+```
+* Merge pull request #1008 from developerinlondon/master (6bdb61bc)
+
+
+```
+Merge pull request #1008 from developerinlondon/master
+
+(BKR-622) Fix Regular Expression to give correct Host IP Address
+```
+* Merge pull request #1022 from bleach/fix_module_howto (125fd861)
+
+
+```
+Merge pull request #1022 from bleach/fix_module_howto
+
+(BKR-636) Fix module howto
+```
+* (BKR-623) Make native runner name consistent (fdd904eb)
+
+
+```
+(BKR-623) Make native runner name consistent
+
+Prior to this we ended up in a state where the beaker native runner
+was in the Beaker::Runner::Native module namespace, but textual and
+--runner references to the runner used the name 'beaker'. This makes
+them consistently 'native'.
+```
+* (BKR-623) Stop advertising minitest runner in --help (1164b15c)
+
+
+```
+(BKR-623) Stop advertising minitest runner in --help
+
+We will wait until this is ready for prime time to mention it.
+```
+* Merge pull request #1012 from kevpl/bkr609_pever_empty (bff4d847)
+
+
+```
+Merge pull request #1012 from kevpl/bkr609_pever_empty
+
+(BKR-609) added checks to make aio_version? more robust
+```
+* (BKR-636) Specify module directory in spec helper (3635726c)
+
+
+```
+(BKR-636) Specify module directory in spec helper
+
+Unless this is specified, the module seems to be installed in
+/etc/puppetlabs/puppet/modules, where it is not found by puppet.
+```
+* (BKR-636) Tell the user to install pry (151d72fe)
+
+
+```
+(BKR-636) Tell the user to install pry
+
+The sample spec_helper requires pry, so we now tell the user to install it.
+```
+* Merge pull request #1014 from heathseals/extraConfig (1317b33b)
+
+
+```
+Merge pull request #1014 from heathseals/extraConfig
+
+(BKR-635) Add VM hostname to VMX data during cloning operations
+```
+* (MAINT) updated yard doc location (1c51fdee)
+
+
+```
+(MAINT) updated yard doc location
+
+Since moving the wiki docs into the repo itself, there's been
+an issue where if you ran the yard rake tasks, you'd blow away
+the in-repo docs, because the default yard doc location is the
+same as the in-repo docs location: . This change makes
+yard create the  folder, and use it for local doc
+generation
+```
+* (BKR-634) Fix YAML deserialization for Beaker::Platform (2ddd8881)
+
+
+```
+(BKR-634) Fix YAML deserialization for Beaker::Platform
+
+The version of Psych shipped with Ruby 1.9.3-p194 did not support
+subclasses of String that added additional ivars to the String class.
+The Beaker::Platform class does just that - subclassing String and
+additional ivars - which meant that round tripping a Beaker::Platform
+object would create an object with improperly initialized instance
+variables. Psych commit e2fcf9af9e95535401f816bc893839b9ad743a9e
+resolved that issue but we still use platforms that have the old version
+of psych.
+
+To resolve this issue, this commit implements a custom #init_with method
+that explicitly sets all instance variables on the Beaker object that
+were defined inside of the YAML map instance, and then reconstructs the
+string value based on those fields.
+```
+* (BKR-472) (BKR-475) Fix solaris for install_pe_on with 2015.2 (e27613e1)
+
+
+```
+(BKR-472) (BKR-475) Fix solaris for install_pe_on with 2015.2
+
+When trying to install puppet-agent collection packages through
+`install_pe_on`, eventually `install_puppet_agent_pe_promoted_repo_on`
+gets called but has no entry for where the solaris packages are kept.
+This commit adds the ability for solaris to install PC puppet-agent
+packages.
+```
+* (BKR-623) Remove inheritance from Beaker::TestSuite (c8610167)
+
+* (BKR-623) migrate TestCase tests into native runner (afc9546a)
+
+* (BKR-632) Include 'minitest' in --runner options list (e84a4059)
+
+* (BKR-623) Add barebones minitest test suite class (a33c5ec5)
+
+* (BKR-623) Migrate TestSuite tests to the native runner (43c7ac77)
+
+* (BKR-635) Add VM hostname to VMX data during cloning operations (55fb8447)
+
+
+```
+(BKR-635) Add VM hostname to VMX data during cloning operations
+
+This commit adds a custom guestinfo keyword and hostname variable
+that allows the VMware Tools to query the hostname.
+```
+* (BKR-623) Rename runner/beaker to runner/native, ... (7d13665e)
+
+
+```
+(BKR-623) Rename runner/beaker to runner/native, ...
+
+... and bring `Beaker::TestCase` into the fold.
+
+Prior to this, `Beaker::TestCase` was still global. In moving it to a nested
+`Beaker::Runner::Beaker::TestCase` I found that a few tests were starting to
+fail. Further investigation showed that references to `Beaker::*` classes
+inside tests were being resolved as `Beaker::Runner::Beaker::*`, and throwing
+constant missing exceptions. Moving `Beaker::Runner::Beaker` to
+`Beaker::Runner::Native` allows ruby's nested class resolution algorithm
+to find `::Beaker` instead of a nested `Beaker` module constant.
+```
+* (BKR-623) Use --runner to choose test suite (f1aace6b)
+
+* (BKR-623) Adjust const_set hack names (06469668)
+
+
+```
+(BKR-623) Adjust const_set hack names
+
+Prior to this, old tests which relied on Beaker::Log being set to
+@logger, would break under our refactorings. For example:
+https://github.com/puppetlabs/puppet/blob/3.8.3/acceptance/tests/security/cve-2013-1653_puppet_kick.rb#L66
+
+This should continue the duct-taping of constant names, kicking the can that much further
+down the road.
+```
+* (BKR-623) Add `--runner` option, defaulting to "beaker" (f392f2a3)
+
+
+```
+(BKR-623) Add `--runner` option, defaulting to "beaker"
+
+Note, we are generally not testing our command-line behavior, our presets, etc.
+This adds a spec that shows how to easily test these sorts of things.
+```
+* (BKR-623) Specialize Beaker::TestSuite (1bf1ed77)
+
+
+```
+(BKR-623) Specialize Beaker::TestSuite
+
+This creates a `lib/beaker/runnner` path, a `Beaker::Runner` module namespace,
+and moves the `Beaker::TestSuite` there, leaving a wrapper subclass behind.
+
+This allows us to treat the current Beaker test runner as a special case, making
+space to add support for other test runners. Everything should continue working
+as before, allowing us to move on to next steps.
+```
+* (BKR-609) added checks to make aio_version? more robust (54f79440)
+
+* {BKR-622} Fix Regular Expression to give correct Host IP Address (5c3331b4)
+
+
+```
+{BKR-622} Fix Regular Expression to give correct Host IP Address
+
+Without this patch applied the hostname can sometimes be incorrectly picked up and this
+creates problem with all the hostnames getting the same IP addresses on a multi-node setup.
+
+Example Nodeset that can cause this problem:
+HOSTS:
+  staging:
+    roles:
+      - sta
+      - master
+    platform: el-6-x86_64
+    box: puppetlabs/centos-6.6-64-puppet
+    box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.6-64-puppet
+    hypervisor: vagrant
+    shared_folder: abc
+    NetworkSettings:
+      IPAddress: 10.255.50.100
+  etl:
+    roles:
+      - etl
+    platform: el-6-x86_64
+    box: puppetlabs/centos-6.6-64-puppet
+    box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.6-64-puppet
+    hypervisor: vagrant
+    NetworkSettings:
+      IPAddress: 10.255.50.120
+CONFIG:
+  type: git
+  destroy: no
+
+In the above scenario, the hostname 'etl' is also available when you search 'puppetlabs'.
+
+The patch fixes this by changing the regular expression to look for the string 'etl' (including
+the quote marks).
+```
+### <a name = "2.29.1">2.29.1 - 23 Nov, 2015 (5d824690)
+
+* (HISTORY) update beaker history for gem release 2.29.1 (5d824690)
 
 * (GEM) update beaker version to 2.29.1 (5781838d)
 

data/Rakefile

@@ -75,8 +75,9 @@ end
 #   Documentation Tasks
 #
 ###########################################################
-DOCS_DAEMON = "yard server --reload --daemon --server thin"
-FOREGROUND_SERVER = 'bundle exec yard server --reload --verbose --server thin lib/beaker'
+DOCS_DIR = 'yard_docs'
+DOCS_DAEMON = "yard server --reload --daemon --server thin --docroot #{DOCS_DIR}"
+FOREGROUND_SERVER = "bundle exec yard server --reload --verbose --server thin lib/beaker --docroot #{DOCS_DIR}"
 
 def running?( cmdline )
   ps = `ps -ef`
@@ -107,7 +108,7 @@ namespace :docs do
   task :clear do
     original_dir = Dir.pwd
     Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-    sh 'rm -rf docs'
+    sh "rm -rf #{DOCS_DIR}"
     Dir.chdir( original_dir )
   end
 
@@ -115,7 +116,7 @@ namespace :docs do
   task :gen => 'docs:clear' do
     original_dir = Dir.pwd
     Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-    output = `bundle exec yard doc`
+    output = `bundle exec yard doc -o #{DOCS_DIR}`
     puts output
     if output =~ /\[warn\]|\[error\]/
       fail "Errors/Warnings during yard documentation generation"

data/docs/How-to-Write-a-Beaker-Test-for-a-Module.md

@@ -66,7 +66,8 @@ RSpec.configure do |c|
   # Configure all nodes in nodeset
   c.before :suite do
     # Install module
-    puppet_module_install(:source => module_root, :module_name => 'mysql')
+    puppet_module_install(:source => module_root, :module_name => 'mysql',
+                          :target_module_path => '/etc/puppet/modules')
     hosts.each do |host|
       on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
     end
@@ -79,13 +80,19 @@ Update spec_helper_acceptance.rb to reflect the module under test.  You will nee
 ###Install beaker-rspec
 ####From Gem (preferred)
 
-    gem install beaker-rspec
+    gem install beaker-rspec pry
 
 ###Update the module's Gemfile
 
-In module's top level directory edit Gemfile.
+In module's top level directory edit the Gemfile. If there is a section that
+begins `group :development, :test do`, then add it there.
 
-Add `gem 'beaker-rspec', :require => false` under `group :development, :test do`.
+```ruby
+gem 'beaker-rspec', :require => false
+gem 'pry',          :require => false
+```
+
+Then run
 
     bundle install
 

data/lib/beaker/cli.rb

@@ -154,7 +154,13 @@ module Beaker
         @logger.notify("No tests to run for suite '#{suite_name.to_s}'")
         return
       end
-      Beaker::TestSuite.new(
+
+      unless runner_class = Beaker::TestSuite.runner(@options[:runner])
+        @logger.error "Test runner #{@options[:runner]} is unknown."
+        exit 1
+      end
+
+      runner_class.new(
         suite_name, @hosts, @options, @timestamp, failure_strategy
       ).run_and_raise_on_failure
     end

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

@@ -1338,6 +1338,12 @@ NOASK
             when /^osx$/
               release_file = "/repos/apple/#{opts[:puppet_collection]}/puppet-agent-*"
               download_file = "puppet-agent-#{variant}-#{version}.tar.gz"
+            when /^solaris$/
+              if arch == 'x86_64'
+                arch = 'i386'
+              end
+              release_file = "/repos/solaris/#{version}/#{opts[:puppet_collection]}/puppet-agent-*#{arch}.pkg.gz"
+              download_file = "puppet-agent-#{varant}-#{version}-#{arch}.tar.gz"
             else
               raise "No pe-promoted installation step for #{variant} yet..."
             end

data/lib/beaker/dsl/roles.rb

@@ -119,25 +119,28 @@ module Beaker
           host['roles'].length == 1 && host['roles'].include?('agent')
       end
 
-      # Determine whether a host has an AIO version or not. If a host :pe_ver or :version
-      # is not specified, then it is open-ended, and as such, can be an AIO
-      # version depending on the context.
+      # Determine whether a host has an AIO version or not. If a host :pe_ver or
+      # :version is not specified, then either the 'aio' role or type will be
+      # needed for a host to be the AIO version.
       #
-      # True when any of the following cases are true
-      #   * has PE version (:pe_ver) >= 4.0
-      #   * has FOSS version (:version) >= 4.0
-      #   * host has role 'aio'
-      #   * host as the type 'aio'
+      # True if host has
+      #   * PE version (:pe_ver) >= 4.0
+      #   * FOSS version (:version) >= 4.0
+      #   * the role 'aio'
+      #   * the type 'aio'
       #
       # @note aio version is just a base-line condition.  If you want to check
       #   that a host is an aio agent, refer to {#aio_agent?}.
       #
       # @return [Boolean] whether or not a host is AIO-capable
       def aio_version?(host)
-        return (( host[:pe_ver] && !version_is_less(host[:pe_ver], '4.0') ) ||
-               ( host[:version] && !version_is_less(host[:version], '4.0') ) ||
-               ( host[:roles] && host[:roles].include?('aio')) ||
-               ( host[:type] && !!(host[:type] =~ /(\A|-)aio(\Z|-)/ ))) == true
+        [:pe_ver, :version].each do |key|
+          version = host[key]
+          return !version_is_less(version, '4.0') if version && !version.empty?
+        end
+        return true if host[:roles] && host[:roles].include?('aio')
+        return true if host[:type] && !!(host[:type] =~ /(\A|-)aio(\Z|-)/ )
+        false
       end
 
       # Determine if the host is an AIO agent