beaker 2.40.0 → 2.41.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDdmMjNiYzBlNDAyM2VlMjVmNDExMDQ0YzFjZDZjMmI3NzM0ODg2OA==
+    ZjUwYTZlZjRmMzlkZmVmMDg3ZjFjMTlkMDNiOGE5MjRhMDcwYmU2MQ==
   data.tar.gz: !binary |-
-    NTYzMGQ3ZDFjNzY0Y2ZmNjJlNGJlYzU2MWQ2NjU4OTY0YzYxZjFjYw==
+    MjEzZWRjNTA4NzRiM2UwYmY0NjEyNjY1MWFmNTRlYWIzYmNlYWRlNw==
 SHA512:
   metadata.gz: !binary |-
-    Y2FiNDJlZjFhYTZmODEyNTUyZWZlYWQ5Mzg3ZDhlZmFiYzBmOTRkNGIwYWZj
-    ZDQ0NGQxNGJhZjMwZjI5MTFkNGEyMTIzMjIwNjg4YzE1ZWFiMTJiMzI3ZGM1
-    ZTg4YmI5MjI4Zjg0ZDU4NWIwZDZjNjdhYzdhY2E5ZTUyZDY3NDA=
+    Y2QxZjA0NmNiMzQxMzIyMzkzMWIwMjk1OTFjN2NiYzU2Y2MzMjIyNTQ0M2U5
+    MDlmN2NkZDBkOTA1ZDlmN2VmZWMwMTUzOTY1ZmExN2QxZjE4OTJkM2I0YTM2
+    NzI4ZmZmYTdhNjQ3NzE3NmQ1M2IxYzk3NGFiZDljNTU1NjQ2NWM=
   data.tar.gz: !binary |-
-    NDU0YWQyMWY0MjZmMjkyNDc0MjE2MzJlZjMxMTYwM2RmOGY3ZDliZDkwYjMw
-    NDYyODc5NGIwMTA3M2FmMjYyZjM3YzkwM2ZjMjM3MWU0NWFiOWMwOTJiZTEx
-    MTU3NWE3M2RjY2Q5ZDYwMzEwMzE5YmFjYWZjNTcxOTMyY2MxZTc=
+    MjlmNzJkZTc2Zjc3MGZjMjNhYWQ4YmQ4MjM1YmE0NzA0MzIzYjYxMTU0Y2Y1
+    NTQ3NTk5MzZhNjJjZGVkMDAxZjY5NTJhNGFiNzg3ODhlMzRlMDAwZGY3NzJk
+    ODQ3ZjY1MTE1ZTI5ZWFkNDI4ODJkOGI4NTllNGExMzliMWU5NDI=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 18 Apr, 2016 (29b0694d)](#LATEST)
+* [LATEST - 10 May, 2016 (859e8702)](#LATEST)
+* [2.40.0 - 18 Apr, 2016 (0a7b948a)](#2.40.0)
 * [2.39.0 - 6 Apr, 2016 (5976e103)](#2.39.0)
 * [2.38.1 - 31 Mar, 2016 (124b91b8)](#2.38.1)
 * [2.38.0 - 30 Mar, 2016 (0878bff7)](#2.38.0)
@@ -116,7 +117,229 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 18 Apr, 2016 (29b0694d)
+### <a name = "LATEST">LATEST - 10 May, 2016 (859e8702)
+
+* (GEM) update beaker version to 2.41.0 (859e8702)
+
+* Merge pull request #1118 from tvpartytonight/BKR-684 (44e11078)
+
+
+```
+Merge pull request #1118 from tvpartytonight/BKR-684
+
+(BKR-684) Update Beaker-Libraries doc
+```
+* (BKR-684) Update Beaker-Libraries doc (69689f76)
+
+
+```
+(BKR-684) Update Beaker-Libraries doc
+
+This PR syncs the internal confluence docs with public Github
+documentation.
+```
+* Merge pull request #1105 from er0ck/fix/master/BKR-779-skip_test_broken_in_with_puppet_running_on (54dd8192)
+
+
+```
+Merge pull request #1105 from er0ck/fix/master/BKR-779-skip_test_broken_in_with_puppet_running_on
+
+(BKR-779) skip_test broken in with_puppet_running_on
+```
+* Merge pull request #1116 from petems/BKR-799-update_fedora_support (1c5a46b7)
+
+
+```
+Merge pull request #1116 from petems/BKR-799-update_fedora_support
+
+(BKR-799) Update Fedora support
+```
+* (BKR-799) Updates specs with more Fedora versions (0553e807)
+
+* (BKR-799) Use systemd for commands from Fedora 14+ (859e8ee1)
+
+* (BKR-799) Use dnf on Fedora from 22 onwards (020522a0)
+
+* Merge pull request #1112 from apollo-io/solaris11-provision (5e04dbd8)
+
+
+```
+Merge pull request #1112 from apollo-io/solaris11-provision
+
+(BKR-789) enable --no-provision for Solaris 11 guests
+```
+* Merge pull request #1114 from briancain/maint/improve-vmpooler-error-msg (0562c213)
+
+
+```
+Merge pull request #1114 from briancain/maint/improve-vmpooler-error-msg
+
+(maint) Improve the error message returned when failing to request vms
+```
+* (maint) Include parsed response in error msg (e0f69a5c)
+
+* Merge pull request #1109 from kevpl/docs_maintainers_create3 (384384f5)
+
+
+```
+Merge pull request #1109 from kevpl/docs_maintainers_create3
+
+(MAINT) added maintainers section to README
+```
+* (maint) Improve the error message returned when failing to request vms (c7dc65be)
+
+
+```
+(maint) Improve the error message returned when failing to request vms
+
+This commit gives a better error message to the user when beaker fails
+to request a host set that doesn't exist in vmpooler.
+```
+* Merge pull request #1110 from er0ck/improve/master/BKR-776-TestCase_methods_for_exporting_structured_data_to_junit_xml (72bff6a5)
+
+
+```
+Merge pull request #1110 from er0ck/improve/master/BKR-776-TestCase_methods_for_exporting_structured_data_to_junit_xml
+
+(BKR-776) test case methods for exporting structured data to junit xml
+```
+* (BKR-789) enable --no-provision for Solaris 11 guests (0c40f30d)
+
+
+```
+(BKR-789) enable --no-provision for Solaris 11 guests
+
+Without this change, it is not possible to run beaker against solaris
+hosts with --no-provision, which means for every test run the VMs must
+be re-provisioned, which has a big impact on the length of time to be
+able to run tests during development lifecycle.
+
+For Solaris the 'rolemod' command is used, but this can only be run
+successfully once, the second time it runs it fails because the root
+user has already been changes from a role to a user.  This change adds a
+check to ensure rolemod is only run if it is needed.
+```
+* Merge pull request #1111 from kevpl/bkr787_vmpooler_dont_reask (4f65721d)
+
+
+```
+Merge pull request #1111 from kevpl/bkr787_vmpooler_dont_reask
+
+(BKR-787) vmpooler only asks for failed hosts on provision request repeat
+```
+* (BKR-787) vmpooler only asks for failed hosts on provision request repeat (a1d8e0d5)
+
+* Merge pull request #1106 from kevpl/docs_test_suites2 (76349e4d)
+
+
+```
+Merge pull request #1106 from kevpl/docs_test_suites2
+
+(MAINT) created test_suites.md
+```
+* Merge pull request #1107 from kevpl/docs_ticket_lifecycle_update (cf27df65)
+
+
+```
+Merge pull request #1107 from kevpl/docs_ticket_lifecycle_update
+
+(MAINT) fixed BKR.next label in JIRA ticket docs
+```
+* (BKR-776) functionality for exporting structured data (to junit xml) (8f3b5327)
+
+
+```
+(BKR-776) functionality for exporting structured data (to junit xml)
+
+This change adds a dsl method `export` which takes a single argument of
+hash data for export to junit.xml.
+This can be used for later storage without storing all of the logfile.
+Think performance benchmarks, flakiness data, etc.
+```
+* (maint) fix up nearby spec tests (c13c2e14)
+
+* (MAINT) added maintainers section to README (620854f1)
+
+
+```
+(MAINT) added maintainers section to README
+
+[skip ci]
+```
+* (MAINT) created test_suites.md (961dbf47)
+
+
+```
+(MAINT) created test_suites.md
+
+[skip ci]
+```
+* (maint) update defaults for common user id_rsa-acceptance keys (20fd411b)
+
+* (BKR-779) add acceptance tests for skip_test and pending_test (9cfd8d3c)
+
+
+```
+(BKR-779) add acceptance tests for skip_test and pending_test
+
+These tests required changes to the pre-suite for puppetpkg.
+We might also require changes to puppetgit and puppetgem and maybe pe.
+we need to tell with_puppet_running_on where to find the correct puppet
+service, otherwise beaker defaults to pe-puppetserver.
+```
+* (BKR-779) skip_test, pending_test, fail_test don't work in with_puppet_running_on (2fc36eb3)
+
+
+```
+(BKR-779) skip_test, pending_test, fail_test don't work in with_puppet_running_on
+
+Prior to this change, these test exits did not work in
+with_puppet_running_on() as the exceptions were not bubbling up to
+TestCase.
+This change rescues the exceptions for these flow-controls before they
+get mangled by the other rescues and sent to TestCase.  We should
+probably be using throw here. But there are too many entanglements to
+get them working in this PR.
+```
+* (maint) cleanup some nearby spec tests (7d16c6d0)
+
+* Merge pull request #1104 from cmurphy/rpm_upgrade (57ec5a6b)
+
+
+```
+Merge pull request #1104 from cmurphy/rpm_upgrade
+
+(MAINT) Use the upgrade install option for rpm packages
+```
+* (MAINT) Use the upgrade install option for rpms (2db3708e)
+
+
+```
+(MAINT) Use the upgrade install option for rpms
+
+Images used in beaker tests might have all kinds of preinstalled
+packages on them, some of which may be out of date. In our case, we
+were preinstalling the puppetlabs el 7.10 release package on images,
+but then running beaker's install_puppet function as a provisional step
+in our tests. Since a new release package was added, this started
+failing[1]. We were able to fix this easily by fixing our images, but
+users depending on externally hosted images, such as vagrant boxes, may
+not be so lucky.
+
+This patch changes the -i flag of the rpm install command to -U so that
+the package will be either installed or, if already present but out of
+date, upgraded. This will not change functionality for users with clean
+images who do not need to upgrade anything. The --replacepkgs flag that
+was already present in the rpm command is not sufficient to remove
+conflicting files from older versions of packages.
+
+[1] http://logs.openstack.org/77/308277/2/check/gate-openstackci-beaker-centos-7/0736982/console.html#_2016-04-20_14_14_12_690
+```
+* (MAINT) fixed BKR.next label in JIRA ticket docs (c49ae8a4)
+
+### <a name = "2.40.0">2.40.0 - 18 Apr, 2016 (0a7b948a)
+
+* (HISTORY) update beaker history for gem release 2.40.0 (0a7b948a)
 
 * (GEM) update beaker version to 2.40.0 (29b0694d)
 

data/README.md

@@ -23,6 +23,19 @@ Beaker functionality has been extended through the use of libraries available as
 
 See [LICENSE](LICENSE) file.
 
-#Support
+#Support & Issues
 
 Please log tickets and issues at our [Beaker Issue Tracker](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR).  In addition there is an active #puppet-dev channel on Freenode.
+
+For additional information on filing tickets, please check out our [CONTRIBUTOR doc](CONTRIBUTING.md),
+and for ticket lifecycle information, checkout our [ticket process doc](docs/meta/ticket_process.md).
+
+#Maintainers
+
+Beaker is maintained by Puppet's Quality Engineering (QE) Team. In particular, our current Beaker maintainers are:
+
+| Name           | Email                |
+|:--------------:|:--------------------:|
+| Kevin Imber    | <ki@puppet.com>      |
+| Tony Vu        | <tony.vu@puppet.com> |
+| Sarah Thompson | <sarah@puppet.com>   |

data/acceptance/config/acceptance-options.rb

@@ -1,3 +1,6 @@
 {
-  :load_path => File.join('acceptance', 'lib')
+  :load_path => File.join('acceptance', 'lib'),
+  :ssh => {
+    :keys => ["id_rsa_acceptance", "#{ENV['HOME']}/.ssh/id_rsa-acceptance"],
+  },
 }

data/acceptance/config/puppetgem/acceptance-options.rb

@@ -1,4 +1,9 @@
 {
+    :type                 => 'foss',
+    :add_el_extras        => 'true',
+    :is_puppetserver      => false,
+    :puppetservice        => 'puppet.service',
     :pre_suite            => 'acceptance/pre_suite/puppet_gem/install.rb',
-    :tests                => 'acceptance/tests/puppet'
-}.merge(eval File.read('acceptance/config/acceptance-options.rb'))
+    :tests                => 'acceptance/tests/puppet',
+    :'master-start-curl-retries' => 30,
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/config/puppetgit/acceptance-options.rb

@@ -1,4 +1,9 @@
 {
+    :type                 => 'foss',
+    :add_el_extras        => 'true',
+    :is_puppetserver      => false,
+    :puppetservice        => 'puppet.service',
     :pre_suite            => 'acceptance/pre_suite/puppet_git/install.rb',
-    :tests                => 'acceptance/tests/puppet'
-}.merge(eval File.read('acceptance/config/acceptance-options.rb'))
+    :tests                => 'acceptance/tests/puppet',
+    :'master-start-curl-retries' => 30,
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/config/puppetpkg/acceptance-options.rb

@@ -1,4 +1,8 @@
 {
+    :type                 => 'foss',
+    :is_puppetserver      => false,
+    :puppetservice        => 'puppet.service',
     :pre_suite            => 'acceptance/pre_suite/puppet_pkg/install.rb',
-    :tests                => 'acceptance/tests/puppet'
-}.merge(eval File.read('acceptance/config/acceptance-options.rb'))
+    :tests                => 'acceptance/tests/puppet',
+    :'master-start-curl-retries' => 30,
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/pre_suite/puppet_gem/install.rb

@@ -1,3 +1,8 @@
 hosts.each do |host|
   install_puppet_from_gem(host, {:version => '3.7.5'})
+  unless host['platform'] =~ /windows/
+    on(host, "touch #{File.join(host.puppet['confdir'],'puppet.conf')}")
+    on(host, puppet('resource user puppet ensure=present'))
+    on(host, puppet('resource group puppet ensure=present'))
+  end
 end

data/acceptance/pre_suite/puppet_git/install.rb

@@ -90,4 +90,9 @@ hosts.each do |host|
   repos.each do |repo|
     install_from_git(host, SourcePath, repo)
   end
+  unless host['platform'] =~ /windows/
+    on(host, "touch #{File.join(host.puppet['confdir'],'puppet.conf')}")
+    on(host, puppet('resource user puppet ensure=present'))
+    on(host, puppet('resource group puppet ensure=present'))
+  end
 end

data/acceptance/tests/base/test_suite/export.rb

@@ -0,0 +1,13 @@
+test_name 'ensure tests can export arbitrary data' do
+
+  step 'export nested hash' do
+    export({'middle earth' => {
+              'Hobbits' => ['Bilbo', 'Frodo'],
+              'Elves' => 'Arwen',
+              :total => {'numbers' => 42}
+              }
+           })
+    export({'another' => 'author'})
+  end
+
+end

data/acceptance/tests/puppet/with_puppet_running_on.rb

@@ -0,0 +1,30 @@
+test_name 'with_puppet_running_on' do
+
+  with_puppet_running_on(master, {}) do
+    puppet_service = master['puppetservice']
+    on(master, puppet("resource service #{puppet_service}")).stdout do |result|
+      assert_match(/running/,result,'did not find puppet service/master running')
+    end
+  end
+
+end
+
+test_name 'skip_test in with_puppet_running_on' do
+
+  with_puppet_running_on(master, {}) do
+    skip_test 'skip rest'
+    assert(false)
+  end
+
+end
+
+test_name 'pending_test in with_puppet_running_on' do
+
+  with_puppet_running_on(master, {}) do
+    pending_test 'pending appendix prepended'
+    assert(false)
+  end
+
+end
+
+# TODO: no idea how to test fail_test in here

data/docs/Beaker-Libraries.md

@@ -1,5 +1,5 @@
 # Beaker Libraries
-The QA team at Puppet Labs has written several libraries that extends the functionality provided
+Engineering at Puppet Labs has written several libraries that extends the functionality provided
 by Beaker.
 
 | Name               | Description                                                         | Docs                                                            |
@@ -8,3 +8,9 @@ by Beaker.
 | beaker_windows     | Useful helpers for testing on Windows hosts                         | [Github Repo](https://github.com/puppetlabs/beaker_windows)     |
 | Puppet Install Helper | Use environment variables for choosing which puppet version to install | [Github Repo](https://github.com/puppetlabs/beaker-puppet_install_helper) |
 | testmode_switcher   | [prototype] run your puppet module tests in master/agent, apply or local mode | [Github Repo](https://github.com/puppetlabs/beaker-testmode_switcher)     |
+| beaker-hostgenerator | Generates Beaker host files | [Github Repo](https://github.com/puppetlabs/beaker-hostgenerator/) |
+| beaker-answers | Generates answers for Puppet Enterprise installation | [Github Repo](https://github.com/puppetlabs/beaker-answers/) |
+| beaker-pe | Adds helper methods for Puppet Enterprise specific tasks | [Github Repo](https://github.com/puppetlabs/beaker-pe/) |
+| Beaker Rubymine Plugin | An IntelliJ IDEA plugin making Beaker test runs a native IDE experience | [Github Repo](https://github.com/samwoods1/BeakerRubyMinePlugin) |
+| beaker-rspec | A bridge between beaker itself and [rspec](https://github.com/rspec/rspec); also integrates [serverspec](http://serverspec.org/) | [Github Repo](https://github.com/puppetlabs/beaker-rspec/) |
+

data/docs/meta/ticket_process.md

@@ -77,7 +77,7 @@ Once your PR is merged, then you can Resolve your ticket.
 
 **NOTE** that when you do this, you should set the FixedVersion to
 
-    BKR next
+    BKR.next
     
 The reason that we do this now and not before is that we use this field to 
 autogenerate our release notes.  We want to make sure that we capture only

data/docs/runner/test_suites.md

@@ -0,0 +1,83 @@
+# Test Suites & Failure Modes
+
+Beaker test suites correspond to test suites in most testing frameworks,
+being containers for tests or pre- or post-testing files to execute.
+
+There are two main ways that you specify which test suites a particular
+file belongs in. The first way is to use the Beaker command line interface
+(CLI) arguments. These are specified in runtime order below:
+
+    --pre-suite
+    —-tests
+    —-post-suite
+    —-pre-cleanup
+
+If you’d like to find out more information about these arguments, or how
+exactly you pass the specified files to each suite, execute `beaker —-help`
+at the CLI.
+
+The second way is to provide suite arguments through config files. There
+are two places that you can provide this info:
+
+1. The `CONFIG` section of a hosts file.
+2. A local options file passed through the `--options-file` CLI argument.
+
+Either way, the keys for the arguments needed are listed below, respective
+to the arguments listed above:
+
+    :pre_suite
+    :tests
+    :post_suite
+    :pre_cleanup
+
+*Note* that one difference between the two methods is that if you provide the
+options via the CLI, we support various input methods such as specifying
+individual files vs paths to folders. The second option (providing keys to
+config files) only works if each file is fully specified. Beaker will not
+find all files in a directory in the second case, that expansion is only done
+on the CLI inputs.
+
+# Suite Details, & Failure Mode Behavior
+
+This section is to explain the particulars of any suite, and any warnings or
+notes about using them, including how they behave in Beaker’s different
+failure modes.
+
+## Pre-Suite
+
+The pre-suite is for setting up the Systems Under Test (SUTs) for the testing
+suite. No surprises here, usually these files are filled with the setup and
+installation code needed to verify that the operating assumptions of the 
+software being tested are true.
+
+Pre-suites, since they’re supposed to contain just setup code, will fail-fast
+and the entire Beaker run will be abandoned if setup fails, since testing
+assumes that setup has succeeded.
+
+## Tests
+
+Time to actually test! This suite contains the test files that you would
+like to verify new code with.
+
+The test suite behaves according to the global fail-mode setting.
+
+## Post-Suite
+
+Usually the post-suite is used to clean up any fixtures that your tests might
+have poisoned, collect any log files that you’d like to later review, and
+to get any resources from the SUTs before they are cleaned up / deleted.
+
+The post-suite only runs if the fail-mode is set to slow, which it is by
+default. Fast fail-mode will skip this suite, so that you can get feedback
+quicker, and you can potentially check out the system in the state exactly
+that it failed in.
+
+## Pre-cleanup
+
+The pre-cleanup suite is for tasks that you’d like to run at the end of your
+tests, regardless of Beaker’s fail-mode. You can think of this behaving as a
+`finally` block at the end of a `try-rescue` one.
+
+The pre-cleanup suite falls back to the global fail-mode setting, which
+defaults to slow, meaning it will run all tests regardless of any early
+failures.

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

@@ -16,7 +16,7 @@ module Beaker
         #     (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 
+        #   @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
@@ -170,6 +170,16 @@ module Beaker
 
             yield self if block_given?
 
+          # FIXME: these test-flow-control exceptions should be using throw
+            # they can be caught in test_case.  current layout dows not allow it
+          rescue Beaker::DSL::Outcomes::PassTest => early_assertion
+            pass_test(early_assertion)
+          rescue Beaker::DSL::Outcomes::FailTest => early_assertion
+            fail_test(early_assertion)
+          rescue Beaker::DSL::Outcomes::PendingTest => early_assertion
+            pending_test(early_assertion)
+          rescue Beaker::DSL::Outcomes::SkipTest => early_assertion
+            skip_test(early_assertion)
           rescue Beaker::DSL::Assertions, Minitest::Assertion => early_assertion
             fail_test(early_assertion)
           rescue Exception => early_exception

data/lib/beaker/dsl/outcomes.rb

@@ -77,6 +77,13 @@ module Beaker
         raise( SkipTest, message )
       end
 
+      # populate a TestCase's @exports[] with structured_data
+      #
+      # @param [Hash,Array<Hash>] data The data to export
+      def export(data)
+        @exports << data
+      end
+
       # Formats an optional message or self appended by a state, either
       # bracketted in newlines
       #

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

@@ -166,7 +166,7 @@ module Unix::Exec
     case self['platform']
     when /debian|ubuntu|cumulus|huaweios/
       exec(Beaker::Command.new("service ssh restart"))
-    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7/
+    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|fedora-(1[4-9]|2[0-9])/
       exec(Beaker::Command.new("systemctl restart sshd.service"))
     when /el-|centos|fedora|redhat|oracle|scientific|eos/
       exec(Beaker::Command.new("/sbin/service sshd restart"))

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

@@ -68,7 +68,7 @@ module Unix::Pkg
         execute("zypper --non-interactive in #{name}", opts)
       when /el-4/
         @logger.debug("Package installation not supported on rhel4")
-      when /fedora-22/
+      when /fedora-(2[2-9])/
         if version
           name = "#{name}-#{version}"
         end
@@ -139,7 +139,7 @@ module Unix::Pkg
     if name =~ /^http/ and opts[:package_proxy]
       proxy = extract_rpm_proxy_options(opts[:package_proxy])
     end
-    execute("rpm #{cmdline_args} -ivh #{name} #{proxy}")
+    execute("rpm #{cmdline_args} -Uvh #{name} #{proxy}")
   end
 
   def uninstall_package(name, cmdline_args = '', opts = {})
@@ -176,7 +176,7 @@ module Unix::Pkg
         execute("zypper --non-interactive --no-gpg-checks up #{name}", opts)
       when /el-4/
         @logger.debug("Package upgrade is not supported on rhel4")
-      when /fedora-22/
+      when /fedora-(2[2-9])/
         execute("dnf -y #{cmdline_args} update #{name}", opts)
       when /cisco|fedora|centos|eos|el-/
         execute("yum -y #{cmdline_args} update #{name}", opts)
@@ -448,7 +448,7 @@ module Unix::Pkg
   )
     variant, version, arch, codename = self['platform'].to_array
     case variant
-    when /^(fedora-22)$/
+    when /^(fedora-(2[2-9]))$/
       execute("tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}")
       execute("dnf --nogpgcheck localinstall -y #{onhost_copied_file}")
     when /^(fedora|el|centos)$/

data/lib/beaker/host_prebuilt_steps.rb

@@ -387,7 +387,7 @@ module Beaker
         logger.notify "Disabling updates.puppetlabs.com by modifying hosts file to resolve updates to 127.0.0.1 on #{host}"
         set_etc_hosts(host, "127.0.0.1\tupdates.puppetlabs.com\n")
       end
-    end 
+    end
 
     # Update sshd_config on debian, ubuntu, centos, el, redhat, cumulus, and fedora boxes to allow for root login
     #
@@ -410,7 +410,7 @@ module Beaker
         elsif host['platform'] =~ /solaris-10/
           host.exec(Command.new("sudo gsed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
         elsif host['platform'] =~ /solaris-11/
-          host.exec(Command.new("sudo rolemod -K type=normal root"), {:pty => true} )
+          host.exec(Command.new("if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi"), {:pty => true} )
           host.exec(Command.new("sudo gsed -i -e 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
         elsif not host.is_powershell?
           host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true})
@@ -420,7 +420,7 @@ module Beaker
         #restart sshd
         if host['platform'] =~ /debian|ubuntu|cumulus/
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
-        elsif host['platform'] =~ /centos-7|el-7|redhat-7/
+        elsif host['platform'] =~ /centos-7|el-7|redhat-7|fedora-(1[4-9]|2[0-9])/
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})

data/lib/beaker/hypervisor/docker.rb

@@ -212,7 +212,7 @@ module Beaker
             RUN apt-get update
             RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
           EOF
-        when /fedora-22/
+        when /fedora-(2[2-9])/
           dockerfile += <<-EOF
             RUN dnf clean all
             RUN dnf install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}

data/lib/beaker/hypervisor/vmpooler.rb

@@ -126,31 +126,41 @@ module Beaker
           @logger.notify "Requesting VM set from vmpooler"
         end
 
-        request.body = request_payload.to_json
+        request_payload_json = request_payload.to_json
+        @logger.trace( "Request payload json: #{request_payload_json}" )
+        request.body = request_payload_json
 
         response = http.request(request)
         parsed_response = JSON.parse(response.body)
+        @logger.trace( "Response parsed json: #{parsed_response}" )
 
         if parsed_response['ok']
           domain = parsed_response['domain']
+          request_payload = {}
 
           @hosts.each_with_index do |h, i|
             # If the requested host template is not available on vmpooler
-            if get_host_info(parsed_response, h['template']).nil?
-              raise "Vmpooler.provision - requested host #{h['template']} not available"
+            host_template = h['template']
+            if get_host_info(parsed_response, host_template).nil?
+              request_payload[host_template] ||= 0
+              request_payload[host_template] += 1
+              next
             end
             if parsed_response[h['template']]['hostname'].is_a?(Array)
-              hostname = parsed_response[h['template']]['hostname'].shift
+              hostname = parsed_response[host_template]['hostname'].shift
             else
-              hostname = parsed_response[h['template']]['hostname']
+              hostname = parsed_response[host_template]['hostname']
             end
 
             h['vmhostname'] = domain ? "#{hostname}.#{domain}" : hostname
 
             @logger.notify "Using available host '#{h['vmhostname']}' (#{h.name})"
           end
+          unless request_payload.empty?
+            raise "Vmpooler.provision - requested VM templates #{request_payload.keys} not available"
+          end
         else
-          raise "Vmpooler.provision - requested host set not available"
+          raise "Vmpooler.provision - response from pooler not ok. Requested host set #{request_payload.keys} not available in pooler.\n#{parsed_response}"
         end
       rescue JSON::ParserError, RuntimeError, *SSH_EXCEPTIONS => e
         @logger.debug "Failed vmpooler provision: #{e.class} : #{e.message}"

data/lib/beaker/test_case.rb

@@ -37,6 +37,10 @@ module Beaker
     # a hash.
     attr_accessor :metadata
 
+    # Necessary for {Beaker::DSL::Outcomes}.
+    # Assumed to be an Array.
+    attr_accessor :exports
+
     #The full log for this test
     attr_accessor :sublog
 
@@ -102,6 +106,7 @@ module Beaker
       @runtime = nil
       @teardown_procs = []
       @metadata = {}
+      @exports  = []
       set_current_test_filename(@path ? File.basename(@path, '.rb') : nil)
 
 

data/lib/beaker/test_suite.rb

@@ -203,6 +203,13 @@ module Beaker
               item['name']      = File.basename(test.path)
               item['time']      = "%f" % test.runtime
 
+              #ugh. nokogiri!!!  item can't take a hash, let alone an array.
+              test.exports.each do |export|
+                export.keys.each do |key|
+                  item[key] = export[key]
+                end
+              end
+
               # Did we fail?  If so, report that.
               # We need to remove the escape character from colorized text, the
               # substitution of other entities is handled well by Rexml

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.40.0'
+    STRING = '2.41.0'
   end
 end

data/spec/beaker/dsl/helpers/puppet_helpers_spec.rb

@@ -5,6 +5,7 @@ class ClassMixedWithDSLHelpers
   include Beaker::DSL::Wrappers
   include Beaker::DSL::Roles
   include Beaker::DSL::Patterns
+  include Beaker::DSL::Outcomes
 
   def logger
     RSpec::Mocks::Double.new('logger').as_null_object
@@ -502,6 +503,33 @@ describe ClassMixedWithDSLHelpers do
       subject.with_puppet_running_on(host, {})
     end
 
+    context 'with test flow exceptions' do
+      it 'can pass_test' do
+        expect( subject ).to receive(:backup_the_file).and_raise(Beaker::DSL::Outcomes::PassTest)
+        expect {
+          subject.with_puppet_running_on(host, {}).to receive(:pass_test)
+        }.to raise_error(Beaker::DSL::Outcomes::PassTest)
+      end
+      it 'can fail_test' do
+        expect( subject ).to receive(:backup_the_file).and_raise(Beaker::DSL::Outcomes::FailTest)
+        expect {
+          subject.with_puppet_running_on(host, {}).to receive(:fail_test)
+        }.to raise_error(Beaker::DSL::Outcomes::FailTest)
+      end
+      it 'can skip_test' do
+        expect( subject ).to receive(:backup_the_file).and_raise(Beaker::DSL::Outcomes::SkipTest)
+        expect {
+          subject.with_puppet_running_on(host, {}).to receive(:skip_test)
+        }.to raise_error(Beaker::DSL::Outcomes::SkipTest)
+      end
+      it 'can pending_test' do
+        expect( subject ).to receive(:backup_the_file).and_raise(Beaker::DSL::Outcomes::PendingTest)
+        expect {
+          subject.with_puppet_running_on(host, {}).to receive(:pending_test)
+        }.to raise_error(Beaker::DSL::Outcomes::PendingTest)
+      end
+    end
+
     describe 'with puppet-server' do
       let(:default_confdir) { "/etc/puppet" }
       let(:default_vardir) { "/var/lib/puppet" }
@@ -842,17 +870,16 @@ describe ClassMixedWithDSLHelpers do
         end
       end
 
+      let(:logger) { double.as_null_object }
       describe 'handling failures' do
 
-        let(:logger) { double.as_null_object }
         before do
           allow( subject ).to receive( :logger ).and_return( logger )
           expect( subject ).to receive(:stop_puppet_from_source_on).and_raise(RuntimeError.new('Also failed in teardown.'))
+          expect( host ).to receive(:port_open?).with(8140).and_return(true)
         end
 
         it 'does not swallow an exception raised from within test block if ensure block also fails' do
-          expect( host ).to receive(:port_open?).with(8140).and_return(true)
-
           expect( subject.logger ).to receive(:error).with(/Raised during attempt to teardown.*Also failed in teardown/)
 
           expect do
@@ -861,8 +888,6 @@ describe ClassMixedWithDSLHelpers do
         end
 
         it 'dumps the puppet logs if there is an error in the teardown' do
-          expect( host ).to receive(:port_open?).with(8140).and_return(true)
-
           expect( subject.logger ).to receive(:notify).with(/Dumping master log/)
 
           expect do
@@ -871,8 +896,6 @@ describe ClassMixedWithDSLHelpers do
         end
 
         it 'does not mask the teardown error with an error from dumping the logs' do
-          expect( host ).to receive(:port_open?).with(8140).and_return(true)
-
           expect( subject.logger ).to receive(:notify).with(/Dumping master log/).and_raise("Error from dumping logs")
 
           expect do
@@ -881,13 +904,14 @@ describe ClassMixedWithDSLHelpers do
         end
 
         it 'does not swallow a teardown exception if no earlier exception was raised' do
-          expect( host ).to receive(:port_open?).with(8140).and_return(true)
           expect( subject.logger).to_not receive(:error)
           expect do
             subject.with_puppet_running_on(host, {})
           end.to raise_error(RuntimeError, 'Also failed in teardown.')
         end
+
       end
+
     end
   end
 

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

@@ -214,20 +214,24 @@ module Beaker
         end
       end
 
-      it "uses yum on fedora-20" do
-        @opts = {'platform' => 'fedora-20-is-me'}
-        pkg = 'fedora_package'
-        expect( Beaker::Command ).to receive(:new).with("yum -y  install #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
-        expect( instance.install_package(pkg) ).to be == "hello"
+      (1..21).to_a.each do | fedora_release |
+        it "uses yum on fedora-#{fedora_release}" do
+          @opts = {'platform' => "fedora-#{fedora_release}-is-me"}
+          pkg = 'fedora_package'
+          expect( Beaker::Command ).to receive(:new).with("yum -y  install #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+          expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
+          expect( instance.install_package(pkg) ).to be == "hello"
+        end
       end
 
-      it "uses dnf on fedora-22" do
-        @opts = {'platform' => 'fedora-22-is-me'}
-        pkg = 'fedora_package'
-        expect( Beaker::Command ).to receive(:new).with("dnf -y  install #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
-        expect( instance.install_package(pkg) ).to be == "hello"
+      (22..29).to_a.each do | fedora_release |
+        it "uses dnf on fedora-#{fedora_release}" do
+          @opts = {'platform' => "fedora-#{fedora_release}-is-me"}
+          pkg = 'fedora_package'
+          expect( Beaker::Command ).to receive(:new).with("dnf -y  install #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+          expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
+          expect( instance.install_package(pkg) ).to be == "hello"
+        end
       end
     end
 
@@ -257,7 +261,7 @@ module Beaker
       it "accepts a package as a single argument" do
         @opts = {'platform' => 'el-is-me'}
         pkg = 'redhat_package'
-        expect( Beaker::Command ).to receive(:new).with("rpm  -ivh #{pkg} ", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+        expect( Beaker::Command ).to receive(:new).with("rpm  -Uvh #{pkg} ", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.install_package_with_rpm(pkg) ).to be == "hello"
       end
@@ -266,7 +270,7 @@ module Beaker
         @opts = {'platform' => 'el-is-me'}
         pkg = 'redhat_package'
         cmdline_args = '--foo'
-        expect( Beaker::Command ).to receive(:new).with("rpm #{cmdline_args} -ivh #{pkg} ", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+        expect( Beaker::Command ).to receive(:new).with("rpm #{cmdline_args} -Uvh #{pkg} ", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
         expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.install_package_with_rpm(pkg, cmdline_args) ).to be == "hello"
       end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -56,6 +56,18 @@ describe Beaker do
     "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /etc/sshd_config"
   ]
 
+  # Solaris
+  it_should_behave_like 'enables_root_login', 'solaris-10', [
+    "sudo -E svcadm restart network/ssh",
+    "sudo gsed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"
+  ], true
+
+  it_should_behave_like 'enables_root_login', 'solaris-11', [
+    "sudo -E svcadm restart network/ssh",
+    "sudo gsed -i -e 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config",
+    "if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi"
+  ], true
+
   ['debian','ubuntu','cumulus'].each do | deb_like |
     it_should_behave_like 'enables_root_login', deb_like, [
       "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",

data/spec/beaker/hypervisor/docker_spec.rb

@@ -11,10 +11,10 @@ end
 
 module Beaker
   platforms = [
-    "ubuntu-14.04-x86_64", 
-    "cumulus-2.2-x86_64", 
-    "fedora-22-x86_64", 
-    "centos-7-x86_64", 
+    "ubuntu-14.04-x86_64",
+    "cumulus-2.2-x86_64",
+    "fedora-22-x86_64",
+    "centos-7-x86_64",
     "sles-12-x86_64"
   ]
 
@@ -427,14 +427,16 @@ module Beaker
         expect( dockerfile ).to be =~ /RUN zypper -n in openssh/
       end
 
-      it 'should use dnf on fedora-22' do
-        FakeFS.deactivate!
-        dockerfile = docker.send(:dockerfile_for, {
-          'platform' => 'fedora-22-x86_64',
-          'image' => 'foobar',
-        })
+      (22..29).to_a.each do | fedora_release |
+        it "should use dnf on fedora #{fedora_release}" do
+          FakeFS.deactivate!
+          dockerfile = docker.send(:dockerfile_for, {
+            'platform' => "fedora-#{fedora_release}-x86_64",
+            'image' => 'foobar',
+          })
 
-        expect( dockerfile ).to be =~ /RUN dnf install -y sudo/
+          expect( dockerfile ).to be =~ /RUN dnf install -y sudo/
+        end
       end
 
       it 'should use user dockerfile if specified' do

data/spec/beaker/hypervisor/vmpooler_spec.rb

@@ -76,13 +76,35 @@ module Beaker
 
       it 'raises an error when a host template is not found in returned json' do
         vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
-        host          = vmpooler.instance_variable_get(:@hosts)[0][:template]
 
         allow( vmpooler ).to receive( :require ).and_return( true )
         allow( vmpooler ).to receive( :sleep ).and_return( true )
-        allow( vmpooler ).to receive(:get_host_info).and_return(nil)
+        allow( vmpooler ).to receive( :get_host_info ).and_return( nil )
 
-        expect {vmpooler.provision}.to raise_error RuntimeError,"Vmpooler.provision - requested host #{host} not available"
+        expect {
+          vmpooler.provision
+        }.to raise_error( RuntimeError,
+          /Vmpooler\.provision - requested VM templates \[.*\,.*\,.*\] not available/
+        )
+      end
+
+      it 'repeats asking only for failed hosts' do
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+
+        allow( vmpooler ).to receive( :require ).and_return( true )
+        allow( vmpooler ).to receive( :sleep ).and_return( true )
+        allow( vmpooler ).to receive( :get_host_info ).with(
+          anything, "vm1_has_a_template" ).and_return( nil )
+        allow( vmpooler ).to receive( :get_host_info ).with(
+          anything, "vm2_has_a_template" ).and_return( 'y' )
+        allow( vmpooler ).to receive( :get_host_info ).with(
+          anything, "vm3_has_a_template" ).and_return( 'y' )
+
+        expect {
+          vmpooler.provision
+        }.to raise_error( RuntimeError,
+          /Vmpooler\.provision - requested VM templates \[[^\,]*\] not available/
+        ) # should be only one item in the list, no commas
       end
     end
 

data/spec/beaker/test_suite_spec.rb

@@ -227,40 +227,86 @@ module Beaker
       end
 
       describe '#write_junit_xml' do
-        let( :options )     { make_opts.merge({ :logger => double().as_null_object, 'name' => create_files(@files), :log_dated_dir => '.', :xml_dated_dir => '.'}) }
-        let(:rb_test)       { 'my_ruby_file.rb'     }
-
-        it 'doesn\'t re-order test cases themselves on time_sort' do
-          nokogiri_mock = Hash.new
-          allow( nokogiri_mock ).to receive( :add_child )
-          allow( Nokogiri::XML::Node ).to receive( :new ) { nokogiri_mock }
-          allow( LoggerJunit ).to receive( :write_xml ).and_yield( Object.new, nokogiri_mock )
-
+        let(:options) { make_opts.merge({:logger => double().as_null_object,
+                                         'name' => create_files(@files),
+                                         :log_dated_dir => '.',
+                                         :xml_dated_dir => '.'}) }
+        let(:rb_test) { 'my_ruby_file.rb' }
+        before(:each) do
+          @nokogiri_mock = Hash.new
+          allow( @nokogiri_mock ).to receive( :add_child )
+          allow( Nokogiri::XML::Node ).to receive( :new ) { @nokogiri_mock }
+          allow( LoggerJunit ).to receive( :write_xml ).and_yield( Object.new, @nokogiri_mock )
           @files = [ rb_test, rb_test, rb_test]
-          ts = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :fast )
-          tsr = ts.instance_variable_get( :@test_suite_results )
-
-          allow( tsr ).to receive( :start_time ).and_return(0)
-          allow( tsr ).to receive( :stop_time ).and_return(10)
-          expect( tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
-
-          test_cases = []
-          3.times do
+          @ts    = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :fast )
+          @tsr   = @ts.instance_variable_get( :@test_suite_results )
+          allow( @tsr ).to receive( :start_time ).and_return(0)
+          allow( @tsr ).to receive( :stop_time ).and_return(10)
+          @test_cases = []
+          @files.each_with_index do |file, index|
             tc = Beaker::TestCase.new( hosts, options[:logger], options, rb_test)
             allow( tc ).to receive( :sublog ).and_return( false )
-            test_cases << tc
+            @test_cases << tc
+          end
+        end
+
+        it 'doesn\'t re-order test cases themselves on time_sort' do
+          expect( @tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
+
+          @test_cases.each_with_index do |tc,index|
+            tc.instance_variable_set(:@runtime, 3**index)
+            @tsr.add_test_case( tc )
           end
-          test_cases[0].instance_variable_set(:@runtime, 3)
-          test_cases[1].instance_variable_set(:@runtime, 301)
-          test_cases[2].instance_variable_set(:@runtime, 101)
-          test_cases.map { |tc| tsr.add_test_case( tc ) }
 
           original_testcase_order = test_suite_result.instance_variable_get( :@test_cases ).dup
-          tsr.write_junit_xml( 'fakeFilePath07', 'fakeFileToLink09', true )
+          time_sort = true
+          @tsr.write_junit_xml( 'fakeFilePath07', 'fakeFileToLink09', time_sort )
           after_testcase_order = test_suite_result.instance_variable_get( :@test_cases ).dup
           expect( after_testcase_order ).to be === original_testcase_order
         end
 
+        it 'writes @export nested hashes properly' do
+          expect( @tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
+          inner_value = {'second' => '2nd'}
+          @test_cases.each do |tc|
+            tc.instance_variable_set(:@runtime, 0)
+            tc.instance_variable_set(:@exports, [{'oh' => 'hai', 'first' => inner_value}])
+            @tsr.add_test_case( tc )
+          end
+          @tsr.write_junit_xml( 'fakeFilePath08' )
+          expect( @nokogiri_mock['oh'] ).to    eq('hai')
+          expect( @nokogiri_mock['first'] ).to eq(inner_value)
+        end
+
+        it 'writes @export array of hashes properly' do
+          expect( @tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
+          @test_cases.each do |tc|
+            tc.instance_variable_set(:@runtime, 0)
+            tc.instance_variable_set(:@exports, [{:yes => 'hello'}, {:uh => 'sher'}])
+            @tsr.add_test_case( tc )
+          end
+          @tsr.write_junit_xml( 'fakeFilePath08' )
+          expect( @nokogiri_mock[:yes] ).to eq('hello')
+          expect( @nokogiri_mock[:uh] ).to  eq('sher')
+        end
+
+        # this isn't the best test as the @nokogiri_mock is a single hash.
+        #   it really should be an array of hashes or nested, to ensure each case
+        #   gets the correct key/value.  But i could not get it to work properly with
+        #   the various calls to ::Node and #add_child
+        it 'writes @export hashes per test case properly' do
+          expect( @tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
+          @test_cases.each_with_index do |tc,index|
+            tc.instance_variable_set(:@runtime, 0)
+            tc.instance_variable_set(:@exports, [{"yes_#{index}" => "hello#{index}"}])
+            @tsr.add_test_case( tc )
+          end
+          @tsr.write_junit_xml( 'fakeFilePath08' )
+          @test_cases.each_with_index do |tc,index|
+            expect( @nokogiri_mock["yes_#{index}"] ).to eq("hello#{index}")
+          end
+        end
+
       end
 
 

data/spec/helpers.rb

@@ -119,12 +119,17 @@ module PlatformHelpers
                      'cumulus',
                      'huaweios']
 
+
+  FEDORASYSTEMD    = (14..29).to_a.collect! { |i| "fedora-#{i}" }
+
   SYSTEMDPLATFORMS = ['el-7',
                       'centos-7',
                       'redhat-7',
                       'oracle-7',
                       'scientific-7',
-                      'eos-7']
+                      'eos-7'].concat(FEDORASYSTEMD)
+
+  FEDORASYSTEMV    = (1..13).to_a.collect! { |i| "fedora-#{i}" }
 
   SYSTEMVPLATFORMS = ['el-',
                       'centos',
@@ -132,5 +137,5 @@ module PlatformHelpers
                       'redhat',
                       'oracle',
                       'scientific',
-                      'eos']
+                      'eos'].concat(FEDORASYSTEMV)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.40.0
+  version: 2.41.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -567,10 +567,12 @@ files:
 - acceptance/tests/base/host_test.rb
 - acceptance/tests/base/packages.rb
 - acceptance/tests/base/packages_unix.rb
+- acceptance/tests/base/test_suite/export.rb
 - acceptance/tests/hypervisor/communication_test.rb
 - acceptance/tests/load_path_bootstrap.rb
 - acceptance/tests/puppet/README.md
 - acceptance/tests/puppet/install_smoke_test.rb
+- acceptance/tests/puppet/with_puppet_running_on.rb
 - beaker.gemspec
 - bin/beaker
 - docs/Access-the-Live-Test-Console-with-Pry.md
@@ -612,6 +614,7 @@ files:
 - docs/hypervisors/vagrant.md
 - docs/meta/README.md
 - docs/meta/ticket_process.md
+- docs/runner/test_suites.md
 - docs/vSphere-Support.md
 - ext/completion/beaker-completion.bash
 - lib/beaker.rb