beaker 2.48.1 → 2.49.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWIxODZmNmI0MzNjNWYwZDVlYjk0NmQyNGNiYjJlOThmMDIxY2MzYw==
+    ZWI4OTU0ZmQ1MGYzNmMxMzkwOWNlM2RmZjQzY2ZhZGIyMDc3MDdiNA==
   data.tar.gz: !binary |-
-    ZDEzZjdlYzQyMWEwZjNjY2Y1Mzk5NDRiODhkYzYwNzU3NzZiZDM3Mw==
+    YWZiN2EwY2Y4NDMwNjRhODZiNjZjZmU4ZTU5YzVlMzBhZTk2ZmI1Nw==
 SHA512:
   metadata.gz: !binary |-
-    NDYwYmY3M2FkMDNmMDhiZjg4ZmZlZGY4YmZkMmM4Njc1OTQxYmQ5MDQxZDkx
-    NmU1YmQ1NjdkMjczYjExMmIzODBjZGNjNWM2NDI1ZWMwZmU2ZTliNGM3MzYz
-    MzVkZGE0YmQ5M2U2YjhlMTliY2U0ZWQ3YmNjZTQwMDFkNzI1OTE=
+    ZjI3YmQwZDJlMGI2OGI1OGJhMGE5YmUzMjZmNGM2ZjViODQ4MzBhYTYzMTNm
+    Zjg3OGVkMThhZDdiMmMwNWMyNzM3ZTNiZTY3ZTBhOTRkYjk2MTVmMTZmMmQ2
+    NjFmN2Y3MjkyY2VmYzQyZGJkZGI4ZmY5ZmNhNmY3OTA0MGI1YWE=
   data.tar.gz: !binary |-
-    ZjcwMTliODIwMjlhMTA3NTgwYTViYmY4OGUyNDhkNDM2OWNlYzllYmZmZTdk
-    MjNkOTAyNWNiMTJhMDc3NWQ0ZGIyMjA2MDM0OTQ5ODc5ZjUxODdhNWU4YjU0
-    N2I1MWYzYmEyYTJlMmUxOWVjMDMzMzFjMGM5NzYwYmM3NGQ4Y2Y=
+    YjU4YzYzMTZiMGVkNTk3ODQ0M2Q4Njk1OTQzNDJlMzkzNjNkYmE0ZTcxMWNh
+    YmM0OTMxYjA4NjBhOGQ4MjU2YzM2YWYzZjZiZGQ2YzI4NWExZmMxZDRiZTYx
+    NGFmODM4ZDJiNDA1N2NmNDJiZmUyM2NkMGY0NWYyYTM5ZTYyNTA=

data/CONTRIBUTING.md

@@ -11,9 +11,8 @@
 
 ## Making Changes
 
-* Create a topic branch from where you want to base your work.
-  * This is the `master` branch in the case of Beaker
-  * To quickly create a topic branch based on master use `git checkout -b my_contribution master`. Please avoid working directly on the `master` branch.
+* Create a topic branch from your fork of [puppetlabs/beaker](https://github.com/puppetlabs/beaker). 
+  * Please title the branch after the beaker ticket you intend to address, ie `BKR-1234`.
 * Make commits of logical units.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are in the proper format.

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 29 Jul, 2016 (90d15165)](#LATEST)
+* [LATEST - 11 Aug, 2016 (966f74b9)](#LATEST)
+* [2.48.1 - 29 Jul, 2016 (e5a52ad4)](#2.48.1)
 * [2.48.0 - 27 Jul, 2016 (47d3aa18)](#2.48.0)
 * [2.47.1 - 15 Jul, 2016 (da89c35b)](#2.47.1)
 * [2.47.0 - 13 Jul, 2016 (bf4cbcf0)](#2.47.0)
@@ -126,7 +127,182 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 29 Jul, 2016 (90d15165)
+### <a name = "LATEST">LATEST - 11 Aug, 2016 (966f74b9)
+
+* (GEM) update beaker version to 2.49.0 (966f74b9)
+
+* (BKR-783) Confusing error messages when key missing from .fog file (#1216) (581ece1f)
+
+* Merge pull request #1217 from kevpl/bkr910_epel7_url_fix (4bf3269e)
+
+
+```
+Merge pull request #1217 from kevpl/bkr910_epel7_url_fix
+
+(BKR-910) fixed EPEL URL, added tests to detect changes
+```
+* Merge pull request #1210 from ferglor/BKR-892 (751e3827)
+
+
+```
+Merge pull request #1210 from ferglor/BKR-892
+
+BKR-892 Generalize how beaker determines run_in_parallel option
+```
+* (BKR-910) fixed EPEL URL, added tests to detect changes (417614c8)
+
+* Merge pull request #1197 from kevpl/docs_style_guide (95225217)
+
+
+```
+Merge pull request #1197 from kevpl/docs_style_guide
+
+(BKR-80) created style guide for beaker tests
+```
+* Output informational message at debug level. (#1209) (5e8b4ced)
+
+
+```
+Output informational message at debug level. (#1209)
+
+(MAINT) Output informational message at debug level
+
+The previous behavior output this as a warning message, causing it to
+appear in red with the default configuration which is probably not
+desired since this is expected in normal conditions.
+```
+* Merge pull request #1203 from kurtwall/use-pretty-generate (24adf82b)
+
+
+```
+Merge pull request #1203 from kurtwall/use-pretty-generate
+
+(MAINT) Use JSON.pretty_generate to create JSON output
+```
+* (MAINT) Document how to do ssh agent forwarding. (#1208) (bb17ae34)
+
+
+```
+(MAINT) Document how to do ssh agent forwarding. (#1208)
+
+* Document how to do ssh agent forwarding.
+
+I literally spent hours understanding that the `@option` / `option` hash
+was coming from the `CONFIG` section…  Such a howto would have saved my
+day :-)
+
+* Clarify what a 'host machine' is.
+
+Suggested by:	@kevpl
+```
+* Merge pull request #1191 from samwoods1/teardown_errors (9f540f37)
+
+
+```
+Merge pull request #1191 from samwoods1/teardown_errors
+
+(BKR-570) Errors in teardown do not obscure errors in test
+```
+* Merge pull request #1211 from tvpartytonight/maint_add_PR_request_procedure (5f43a8f3)
+
+
+```
+Merge pull request #1211 from tvpartytonight/maint_add_PR_request_procedure
+
+(MAINT) Modify PR instructions
+```
+* (MAINT) Modify PR instructions (5a433ecd)
+
+* BKR-892 Generalize how beaker determines run_in_parallel option (80f3e1bb)
+
+* Update last spec test (066094bb)
+
+* Merge branch 'master' of https://github.com/puppetlabs/beaker into use-pretty-generate (0a33b21e)
+
+* Merge pull request #1200 from johnduarte/bkr-894-aix-dns (ec2657eb)
+
+
+```
+Merge pull request #1200 from johnduarte/bkr-894-aix-dns
+
+(BKR-894) AIX - prefer local DNS if hosts file changed
+```
+* Merge pull request #1187 from samwoods1/log_at_failure (63920f57)
+
+
+```
+Merge pull request #1187 from samwoods1/log_at_failure
+
+(BKR-890) Surface and provide more visibility into where failures occured
+```
+* Merge pull request #1204 from kevpl/docs_file_archiving (e1f3bd51)
+
+
+```
+Merge pull request #1204 from kevpl/docs_file_archiving
+
+(MAINT) added archiving SUT files doc
+```
+* Merge pull request #1205 from tvpartytonight/maint_fix_folder_link (e8835781)
+
+
+```
+Merge pull request #1205 from tvpartytonight/maint_fix_folder_link
+
+(MAINT) Fix link to folder from /doc README
+```
+* (MAINT) Fix link to folder from /doc README (2c651e99)
+
+* (MAINT) added archiving SUT files doc (1bcce26d)
+
+
+```
+(MAINT) added archiving SUT files doc
+
+[skip ci]
+```
+* (MAINT) Use JSON.pretty_generate instead of JSON.dump to create JSON (4a98bf79)
+
+
+```
+(MAINT) Use JSON.pretty_generate instead of JSON.dump to create JSON
+for TK config files.
+
+JSON.dump ruins the formatting of JSON files, which can make TK config
+files difficult to read. This commit replaces .dump with .pretty_generate
+to preserve config file formatting and readability.
+```
+* (BKR-894) AIX - prefer local DNS if hosts file changed (d5a3363e)
+
+
+```
+(BKR-894) AIX - prefer local DNS if hosts file changed
+
+This commit adds logic to the `set_etc_hosts` method to change the
+preferred DNS resolution order on AIX platforms.
+
+By default, AIX will first use external DNS to resolve a name even
+if the name has an entry in the `/etc/hosts` file. This means that
+an externally resolvable hostname cannot be overridden by a local
+entry in `/etc/hosts` unless the resolution order is changed. The
+logic added with this commit adds the configuration to give precedence
+to local DNS resolution.
+```
+* (BKR-80) created style guide for beaker tests (db298c85)
+
+
+```
+(BKR-80) created style guide for beaker tests
+
+[skip ci]
+```
+* (BKR-570) Errors in teardown do not obscure errors in test (19208967)
+
+* (BKR-890) Log failure info and stack inline in log. (671c5ea7)
+
+### <a name = "2.48.1">2.48.1 - 29 Jul, 2016 (e5a52ad4)
+
+* (HISTORY) update beaker history for gem release 2.48.1 (e5a52ad4)
 
 * (GEM) update beaker version to 2.48.1 (90d15165)
 

data/acceptance/tests/base/external_resources_test.rb

@@ -0,0 +1,34 @@
+test_name 'External Resources Test' do
+  step 'Verify EPEL is correct' do
+    def epel_url_test(el_version, arch, pkg_key)
+      url = "#{@options[:epel_url]}/#{el_version}/#{arch}/#{@options[pkg_key]}"
+      curl_headers_result = default.exec(Command.new("curl -I #{url}"))
+      assert_match(/200 OK/, curl_headers_result.stdout, "EPEL #{el_version} should be reachable")
+    end
+
+    step 'arch is i386' do
+      @arch = 'i386'
+      # epel-7 does not provide packages for i386
+      step 'EPEL 6' do
+        epel_url_test(6, @arch, :epel_6_pkg)
+      end
+      step 'EPEL 5' do
+        epel_url_test(5, @arch, :epel_5_pkg)
+      end
+    end
+
+    step 'arch is x86_64' do
+      @arch = 'x86_64'
+      step 'EPEL 7' do
+        # note: interpolation gets around URL change for epel 7
+        epel_url_test(7, "#{@arch}/e", :epel_7_pkg)
+      end
+      step 'EPEL 6' do
+        epel_url_test(6, @arch, :epel_6_pkg)
+      end
+      step 'EPEL 5' do
+        epel_url_test(5, @arch, :epel_5_pkg)
+      end
+    end
+  end
+end

data/docs/README.md

@@ -1,6 +1,6 @@
 ![Beaker Muppet Image](http://images4.wikia.nocookie.net/__cb20101015151248/muppet/images/0/05/Beaker.jpg)
 
-Documentation for Beaker can be found in this repository in [the docs/ folder](README.md).
+Documentation for Beaker can be found in this repository in [the docs/ folder]().
 
 ## Table of Contents
 

data/docs/concepts/style_guide.md

@@ -0,0 +1,216 @@
+# Beaker Style Guide
+
+## Scope of this guide
+
+The purpose of this guide is to provide definitions for best practices when
+writing Beaker tests, both syntactically and stylistically. This guide will
+define and provide examples for preferred test layout and conventions. Common
+patterns that are recommended as well as patterns that should be avoided will be
+described.
+
+No style manual can cover every possible circumstance. When a judgement call
+becomes necessary, keep in mind the following general ideas:
+
+1. **Readability matters**. If you have to choose between two equally effective
+alternatives, pick the more readable one. This is, of course, subjective, but if
+you can read your own code three months from now, that's a great start. Don't be
+clever over readable, unless you have a documented purpose. Use object oriented
+programming when things get complex and
+[DRY](https://en.wikipedia.org/wiki/Don%27t_repeat_yourself).
+2. **Inherit upstream conventions**. Beaker is still ruby, so use the
+[ruby community style guide](https://github.com/bbatsov/ruby-style-guide). When
+not called out here, use the ruby style guide.
+
+## Test Naming
+
+Tests should test what they say they test. Test names, both the name of the test
+file and the value given to the
+[`test_name`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Structure#test_name-instance_method)
+function, should provide an accurate indication about the purpose of the test.
+
+The `test_name` function should be the first line in the Beaker test file.
+
+**Good:**
+```ruby
+# head -1 puppet/acceptance/tests/resource/file/should_default_mode.rb
+test_name "file resource: set default modes" do
+```
+
+## Structure Methods Should Use Explicit Blocks
+
+These methods aid in self-documenting your tests, including indention in the
+logs. If you don't use explicit blocks, beaker does not know how to properly
+indent your test's output.
+
+The most common
+[structure methods](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Structure)
+are
+[`#test_name`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Structure#test_name-instance_method),
+[`#step`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Structure#step-instance_method),
+and
+[`#teardown`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Structure#teardown-instance_method).
+
+**Good:**
+```ruby
+step 'do this thang' do
+  on(host, "echo 'do this thang'")
+end
+```
+**Bad:**
+```ruby
+step 'do this thang'
+on(host, "echo 'do this thang'")
+```
+
+## Teardowns
+
+- Return the state of the system to the way it was prior to test execution
+- Put the teardown as early in the test as possible
+
+Teardowns must be used to return the system to the state it was in prior to the
+execution or attempted execution of the test. Beaker will gather all teardowns
+encountered throughout the execution path of the test. These teardowns will all
+be executed when the test exits, even if the test exits early due to a failure
+or error.
+
+### Place Teardowns Early
+
+Teardowns can be placed anywhere in the test file or its helpers. The preferred
+style is to have a teardown step near the beginning of the test file to show the
+reader that the system state will be restored.
+
+**Good:**
+```ruby
+test_name 'The source attribute' do
+
+  target_file_on_nix = '/tmp/source_attr_test'
+  teardown do
+    hosts.each do |host|
+      on(host, "rm #{target_file_on_nix}", :accept_all_exit_codes => true) unless host['platform'] =~ /^win/
+    end
+  end
+  ...
+end
+```
+
+Teardowns are at the mercy of the scoping of the variables necessary to perform
+the restoration of the system. This fact means that additional teardown steps
+will need to be added within the scope necessary to do their job. Effort should
+be taken to make the teardown steps prominent and readable so that it can be
+confirmed, via the logs, that the system has been restored.
+
+Teardown steps registered outside of tests should use
+[`#step`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Structure#step-instance_method)
+to document and log what they are doing.
+
+## Acceptable Exit Codes
+
+When using the Beaker
+[`on`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#on-instance_method)
+method, the default setting is that only an exit code of 0 (zero) will not
+trigger an error. When other exit codes are acceptable, the
+`:acceptable_exit_codes` key with an array of exit codes should be passed in the
+options hash to `#on`. If 0 (zero) is the only acceptable exit code, then the
+`:acceptable_exit_codes` symbol must not be used.
+
+**Good:**
+
+- Single 0 exit code allowed
+```ruby
+on(host, "rm #{file_to_rm}")
+```
+- Single non-0 exit code allowed
+```ruby
+on(host, "rm #{file_to_rm}", :acceptable_exit_codes => 1)
+```
+- Multiple exit codes allowed
+```ruby
+on(host, "rm #{file_to_rm}", :acceptable_exit_codes => [0,1])
+```
+- Any exit code allowed
+```ruby
+on(host, "rm #{file_to_rm}", :accept_all_exit_codes => true)
+```
+
+In the last case, when any exit code is allowed, one must follow-up with a valid
+assertion test.
+
+If an exit_code outside of 0 is expected, one must use acceptable_exit_codes so
+the test will fail on the proper assertion and not error at that command.  Allow
+only the minimum expected set of exit codes unless coverage is provided by
+subsequent assertions.
+
+## Test Outcomes
+
+When to use each, and how to format the message:
+
+### Expecting Failure
+
+If your tests are failing due to an "expected failure", you should wrap your
+failing assertion in an
+[`expect_failure`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Structure#expect_failure-instance_method)
+block with an explanatory logging message:
+
+```ruby
+expect_failure('expected to fail due to PE-1234') do
+  assert_equal(400, response.code, 'bad response code from API call')
+end
+```
+
+Note that `expect_failure` will only trigger from failed assertions. It won't
+take care of failed host or `on` commands. To deal with expected failure from an
+`on` invocation, you'd want something more like this:
+
+```ruby
+on(blah, 'blah', :allow_all_exit_codes => true) do |result|
+  expect_failure 'known issue: TIK-1234' do
+    assert_equal(4,result.exit_code,'did not receive expected exit code for blah')
+  end
+end
+```
+
+### `fail_test`, `pass_test`, & `skip_test`
+
+These can be used anywhere in a test to exit early. A
+[`skip_test`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Outcomes#fail_test-instance_method)
+between two assertions, for instance, will run the first assertion, raise an
+exception for `skip_test`, run teardown, and then exit as we expect. The same is
+true for
+[fail_test](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Outcomes#fail_test-instance_method).
+
+[`pass_test`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Outcomes#fail_test-instance_method)
+is typically not required. When the end of a test is reached without causing an
+error (due to bad test code execution, or an unhandled exit code or exception)
+or failure (due to assertions), then it passes.
+
+`pass_test` can be used in a situation where one knows a test has passed before
+the end of a test under certain circumstances, such as during a loop that has
+not yet completed.
+
+### Skipping Tests
+
+Skipping tests can be used, for instance, when they are temporarily failing or
+not yet complete.
+
+**Good:**
+```ruby
+skip_test 'requires puppet and mcollective service scripts from AIO agent package' if @options[:type] != 'aio'
+```
+**Bad:**
+```ruby
+confine :to, :platform => 'solaris:pending'
+```
+
+## Confining
+
+Another way that you can skip or manipulate tests is by confining them to apply
+to a subset of the SUTs available for testing. Confining is a complex topic, and
+one we don't have the length to get into in the style guide. For an explanation
+of confining, as well as the best practices in using it, check out our
+[confine doc](../how_to/confine.md).
+
+## Assertions
+
+Always include a _unique_ error message in your assertion statement. Use strict
+asserts whenever possible (e.g. assert_equal, assert_match.
+[More info](http://danwin.com/2013/03/ruby-minitest-cheat-sheet/)).

data/docs/how_to/archive_sut_files.md

@@ -0,0 +1,31 @@
+# How to Archive Files from the Systems Under Test (SUTs)
+
+Oftentimes when you're dealing with beaker test development or troubleshooting
+a failed acceptance test, you'll need to get information from a SUT. The
+traditional way that we've advocated getting information from these machines is
+to use our [preserved hosts functionality](preserve_hosts.md).
+
+If you're preserving hosts just to SSH in and look at log files, however, this
+can be a tedious exercise. Why not just bring the log files to you on the
+beaker coordinator? This doc explains exactly how to do that using our
+`archive_file_from` Domain-Specific Language (DSL) method
+([method rubydocs](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#archive_file_from-instance_method)).
+
+# How Do I Use This?
+
+`archive_file_from` is a part of the beaker DSL, so it's available in all test
+suites. Just call it from your tests, and it'll execute, pulling any particular
+file you need off your SUTs, and dropping it on your beaker coordinator's
+file system.
+
+A common example of a post-suite step to archive files that were created during
+a particular test is included in the Rubydocs, referenced above. Path details,
+and details of all method arguments are documented there as well. Check it out,
+and with the right use, you won't need to preserve hosts at all to debug any
+test failures.
+
+# When Did This Come Out?
+
+`archive_file_from` was originally added to the DSL in beaker
+[2.48.0](https://github.com/puppetlabs/beaker/releases/tag/2.48.0), released on
+[July 27, 2016](https://github.com/puppetlabs/beaker/blob/master/HISTORY.md#2480---27-jul-2016-47d3aa18).

data/docs/how_to/hypervisors/README.md

@@ -7,6 +7,12 @@ If you don't see a file here for a hypervisor, then it's either not yet document
 (feel free to help us out here!), or it should conform to our normal hypervisor
 assumptions.
 
+# Credentials File
+
+Beaker uses credentials from a .fog file for authentication. 
+By default, the file is located under the user's home directory. This helps to keep the credentials confidential. 
+The path of .fog file can be changed by setting the 'dot_fog' option.
+
 # External Hypervisors
 
 There are a number of community-supported hypervisors that have not been added to

data/docs/how_to/preserve_hosts.md

@@ -7,6 +7,24 @@ able to quickly iterate on those tests in an already setup System Under Test
 (SUT) configuration. Beaker provides the ability to do that using its preserved
 hosts functionality.
 
+## But Is This The Right Solution?
+
+Many people are of the opinion that if you have to login to a SUT, then you've
+already failed, and that the purpose of good automation is so that you don't
+ever have to do this. Beaker supports a diverse group of developers and testers,
+and we try to remain flexible and support multiple approaches to these problems.
+
+Another approach you might take to debugging failed tests, during development or
+test runs in your Continuous Integration (CI) systems, is to archive any
+artifacts or log files from the SUTs, so that you can read them all from the
+beaker coordinator. Beaker provides a Domain-Specific Language (DSL) method to
+accomodate this workflow, called `archive_file_from`. Check out the
+[how-to article](archive_sut_files.md) on this method for details on it.
+
+That being said, the preserved hosts functionality is still useful, particularly
+for new development. In this case, you might not be able to necessarily tell
+what files you might need from your SUTs, and exploration might be necessary.
+
 ## How Do I Use It?
 
 Note that where you decide to use this option will affect its precedence. You

data/docs/how_to/ssh_agent_forwarding.md

@@ -0,0 +1,31 @@
+# How to Forward ssh(1) Agent
+
+`ssh(1)` agent forwarding can is activated in the `CONFIG` section of the hosts
+file:
+
+~~~yaml
+HOSTS:
+  ...
+CONFIG:
+  forward_ssh_agent: true
+~~~
+
+Beaker will then make the ssh agent running on the beaker coordinator available to the Systems Under Test (SUT).  There is
+a gotcha though: the agent socket file in the SUT is only available
+to the user who signed in.  If you want to access remote machine resources as
+another user, you *must* change the socket permission.
+
+A dirty hack is to `chmod -R 777 /tmp/ssh-*` before changing to another user
+and relying on `$SSH_AUTH_SOCK`.
+
+Example:
+
+~~~puppet
+exec { '/bin/chmod -R 777 /tmp/ssh-*':
+} ->
+vcsrepo { '/var/www/app':
+  provider => 'git',
+  source   => 'https://example.com/git/app.git',
+  user     => 'deploy'
+}
+~~~

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

@@ -50,7 +50,7 @@ module Beaker
             new_hash.merge!(options_hash)
           end
 
-          file_string = JSON.dump(new_hash)
+          file_string = JSON.pretty_generate(new_hash)
           create_remote_file host, config_file_path, file_string
         end
 

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

@@ -261,10 +261,8 @@ module Beaker
           else
             # Use option specified in the method call, otherwise check whether the global
             # run_in_parallel option includes install
-            run_in_parallel = opts[:run_in_parallel]
-            run_in_parallel = ((@options && @options[:run_in_parallel].is_a?(Array)) ?
-                @options[:run_in_parallel].include?('install') : false) if run_in_parallel.nil?
-            block_on hosts, { :run_in_parallel => run_in_parallel} do |host|
+            run_in_parallel = run_in_parallel? opts, @options, 'install'
+            block_on hosts, { :run_in_parallel => run_in_parallel } do |host|
               if host['platform'] =~ /el-(5|6|7)/
                 relver = $1
                 install_puppet_from_rpm_on(host, opts.merge(:release => relver, :family => 'el'))
@@ -340,9 +338,7 @@ module Beaker
           opts[:puppet_collection] ||= 'pc1' #hi!  i'm case sensitive!  be careful!
           opts[:puppet_agent_version] ||= opts[:version] #backwards compatability with old parameter name
 
-          run_in_parallel = opts[:run_in_parallel]
-          run_in_parallel = ((@options && @options[:run_in_parallel].is_a?(Array)) ?
-              @options[:run_in_parallel].include?('install') : false) if run_in_parallel.nil?
+          run_in_parallel = run_in_parallel? opts, @options, 'install'
           block_on hosts, { :run_in_parallel => run_in_parallel } do |host|
             add_role(host, 'aio') #we are installing agent, so we want aio role
             package_name = nil

data/lib/beaker/host_prebuilt_steps.rb

@@ -332,6 +332,14 @@ module Beaker
       else
         host.exec(Command.new("echo '#{etc_hosts}' >> /etc/hosts"))
       end
+      # AIX must be configured to prefer local DNS over external
+      if host['platform'] =~ /aix/
+        aix_netsvc = '/etc/netsvc.conf'
+        aix_local_resolv = 'hosts = local, bind'
+        unless host.exec(Command.new("grep '#{aix_local_resolv}' #{aix_netsvc}"), :accept_all_exit_codes => true).exit_code == 0
+          host.exec(Command.new("echo '#{aix_local_resolv}' >> #{aix_netsvc}"))
+        end
+      end
     end
 
     #Make it possible to log in as root by copying the current users ssh keys to the root account

data/lib/beaker/hypervisor.rb

@@ -103,8 +103,8 @@ module Beaker
     #to the provided SUT for test execution to be successful.
     def configure(opts = {})
       return unless @options[:configure]
-      block_on @hosts, { :run_in_parallel => (@options && @options[:run_in_parallel].is_a?(Array)) ?
-          @options[:run_in_parallel].include?('configure') : false} do |host|
+      run_in_parallel = run_in_parallel? opts, @options, 'configure'
+      block_on @hosts, { :run_in_parallel => run_in_parallel} do |host|
         if host[:timesync]
           timesync(host, @options)
         end

data/lib/beaker/hypervisor/vmpooler.rb

@@ -39,6 +39,9 @@ module Beaker
 
       creds
 
+    rescue TypeError, Psych::SyntaxError => e
+      @logger.warn "#{e.class}: Credentials file (#{dot_fog}) has invalid syntax; proceeding without authentication"
+      creds
     rescue Errno::ENOENT
       @logger.warn "Credentials file (#{dot_fog}) not found; proceeding without authentication"
       creds

data/lib/beaker/options/presets.rb

@@ -171,7 +171,7 @@ module Beaker
           :add_el_extras          => false,
           :epel_url               => "http://dl.fedoraproject.org/pub/epel",
           :epel_arch              => "i386",
-          :epel_7_pkg             => "epel-release-7-7.noarch.rpm",
+          :epel_7_pkg             => "epel-release-7-8.noarch.rpm",
           :epel_6_pkg             => "epel-release-6-8.noarch.rpm",
           :epel_5_pkg             => "epel-release-5-4.noarch.rpm",
           :consoleport            => 443,

data/lib/beaker/shared.rb

@@ -1,4 +1,4 @@
-[ 'repetition', 'error_handler', 'host_manager', 'timed', 'semvar' ].each do |lib|
+[ 'repetition', 'error_handler', 'host_manager', 'timed', 'semvar', 'options_resolver' ].each do |lib|
   require "beaker/shared/#{lib}"
 end
 module Beaker
@@ -8,6 +8,7 @@ module Beaker
     include Beaker::Shared::Repetition
     include Beaker::Shared::Timed
     include Beaker::Shared::Semvar
+    include Beaker::Shared::OptionsResolver
   end
 end
 include Beaker::Shared

data/lib/beaker/shared/host_manager.rb

@@ -102,7 +102,7 @@ module Beaker
         end
         if block_hosts.is_a? Array
           if block_hosts.length > 0
-            if opts[:run_in_parallel] == true
+            if run_in_parallel? opts
               # Pass caller[1] - the line that called block_on - for logging purposes.
               result = block_hosts.map.each_in_parallel(caller[1]) do |h|
                 run_block_on h, &block

data/lib/beaker/shared/options_resolver.rb

@@ -0,0 +1,41 @@
+module Beaker
+  module Shared
+    # Methods for parsing options.
+    module OptionsResolver
+      # parses local and global options to determine if a particular mode should
+      # be run in parallel. typically, local_options will specify a true/false 
+      # value, while global_options will specify an array of mode names that should
+      # be run in parallel. the value specified in local_options will take precedence
+      # over the values specified in global_options. 
+      # @param [Hash] local_options local options for running in parallel
+      # @option local_options [Boolean] :run_in_parallel flag for running in parallel
+      # @param [Hash] global_options global options for running in parallel
+      # @option global_options [Array<String>] :run_in_parallel list of modes to run in parallel
+      # @param [String] mode the mode we want to query global_options for
+      # @return [Boolean] true if the specified mode is in global_options and :run_in_parallel in local_options is not false, 
+      #   or if :run_in_parallel in local_options is true, false otherwise
+      # @example
+      #   run_in_parallel?({:run_in_parallel => true}) 
+      #   -> will return true
+      #
+      #   run_in_parallel?({:run_in_parallel => true}, {:run_in_parallel => ['install','configure']}, 'install') 
+      #   -> will return true
+      #
+      #   run_in_parallel?({:run_in_parallel => false}, {:run_in_parallel => ['install','configure']}, 'install') 
+      #   -> will return false
+      def run_in_parallel?(local_options=nil, global_options=nil, mode=nil)
+        run_in_parallel = local_options[:run_in_parallel] unless local_options.nil?
+
+        if !run_in_parallel.nil? && run_in_parallel.is_a?(Array)
+          run_in_parallel = false
+        end
+
+        if run_in_parallel.nil? && global_options && global_options[:run_in_parallel].is_a?(Array)
+          run_in_parallel = global_options[:run_in_parallel].include?(mode)
+        end
+
+        run_in_parallel
+      end
+    end
+  end
+end

data/lib/beaker/ssh_connection.rb

@@ -102,7 +102,7 @@ module Beaker
         raise e
       ensure
         @ssh = nil
-        @logger.warn("ssh connection to #{@hostname} has been terminated")
+        @logger.debug("ssh connection to #{@hostname} has been terminated")
       end
     end
 

data/lib/beaker/test_case.rb

@@ -132,8 +132,7 @@ module Beaker
               test = File.read(path)
               eval test,nil,path,1
             rescue FailTest, TEST_EXCEPTION_CLASS => e
-              @test_status = :fail
-              @exception   = e
+              log_and_fail_test(e, :fail)
             rescue PendingTest
               @test_status = :pending
             rescue SkipTest
@@ -146,7 +145,7 @@ module Beaker
                 begin
                   teardown.call
                 rescue StandardError, SignalException, TEST_EXCEPTION_CLASS => e
-                  log_and_fail_test(e)
+                  log_and_fail_test(e, :teardown_error)
                 end
               end
               @logger.info('End teardown')
@@ -166,14 +165,19 @@ module Beaker
         # individually as well.
         #
         # @param exception [Exception] exception to fail with
-        def log_and_fail_test(exception)
+        # @param exception [Symbol] the test status
+        def log_and_fail_test(exception, status=:error)
           logger.error("#{exception.class}: #{exception.message}")
           bt = exception.backtrace
           logger.pretty_backtrace(bt).each_line do |line|
             logger.error(line)
           end
-          @test_status = :error
-          @exception   = exception
+          # If the status is already a test failure or error, don't overwrite with the teardown failure.
+          unless status == :teardown_error && (@test_status == :error || @test_status == :fail)
+            status = :error if status == :teardown_error
+            @test_status = status
+            @exception   = exception
+          end
         end
       end
     end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.48.1'
+    STRING = '2.49.0'
   end
 end

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

@@ -35,7 +35,7 @@ describe ClassMixedWithDSLHelpers do
 
     shared_examples 'modify-tk-config-without-error' do
       it 'dumps to the SUT config file path' do
-        allow( JSON ).to receive(:dump)
+        allow( JSON ).to receive(:pretty_generate)
         allow( subject ).to receive(:create_remote_file).with(host, config_file_path, anything())
         subject.modify_tk_config(host, config_file_path, options_hash, replace)
       end
@@ -72,7 +72,7 @@ describe ClassMixedWithDSLHelpers do
 
       describe 'given a true value to its `replace` parameter' do
         before do
-          expect( JSON ).to receive(:dump)
+          expect( JSON ).to receive(:pretty_generate)
           expect( subject ).to receive(:create_remote_file).with(host, config_file_path, anything())
         end
         include_examples('modify-tk-config-without-error')

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -169,7 +169,7 @@ describe Beaker do
     it "can return the correct url for an el-7 host" do
       host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-7-platform') } )
 
-      expect( subject.epel_info_for( host, options )).to be === ["http://dl.fedoraproject.org/pub/epel/7", "x86_64", "epel-release-7-7.noarch.rpm"]
+      expect( subject.epel_info_for( host, options )).to be === ["http://dl.fedoraproject.org/pub/epel/7", "x86_64", "epel-release-7-8.noarch.rpm"]
     end
 
     it "can return the correct url for an el-6 host" do

data/spec/beaker/hypervisor/vmpooler_spec.rb

@@ -181,6 +181,51 @@ module Beaker
         expect( vmpooler.credentials ).to be == { }
       end
 
+      it 'continues without credentials when there are formatting errors in the fog file' do
+        data = { "'default'" => { :vmpooler_token => "b2wl8prqe6ddoii70md" } }
+
+        allow_any_instance_of( Beaker::Vmpooler ).to \
+          receive(:read_fog_file).and_return(data)
+
+        logger = double('logger')
+      
+        expect(logger).to receive(:warn).with(/is missing a :default section with a :vmpooler_token value/)
+        make_opts = {:logger => logger}
+
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        expect( vmpooler.credentials ).to be == { }
+      end
+
+      it 'throws a TypeError and continues without credentials when there are syntax errors in the fog file' do
+        data = "'default'\n  :vmpooler_token: z2wl8prqe0ddoii70ad"
+
+        allow( File ).to receive( :open ).and_yield( StringIO.new(data)  )
+        logger = double('logger')
+      
+        expect(logger).to receive(:warn).with(/TypeError: .* has invalid syntax/)
+        make_opts = {:logger => logger}
+
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        
+        expect( vmpooler.credentials ).to be == { }
+      end
+
+      it 'throws a Psych::SyntaxError and continues without credentials when there are syntax errors in the fog file' do
+
+        data = ";default;\n  :vmpooler_token: z2wl8prqe0ddoii707d"
+
+        allow( File ).to receive( :open ).and_yield( StringIO.new(data)  )
+
+        logger = double('logger')
+      
+        expect(logger).to receive(:warn).with(/Psych::SyntaxError: .* invalid syntax/)
+        make_opts = {:logger => logger}
+
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        
+        expect( vmpooler.credentials ).to be == { }
+      end
+
       it 'stores vmpooler token when found in fog file' do
         data = { :default => { :vmpooler_token => "TOKEN" } }
 

data/spec/beaker/shared/options_resolver_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+module Beaker
+  module Shared
+    describe OptionsResolver do
+
+      describe 'run_in_parallel?' do
+
+        it 'returns true if :run_in_parallel in opts is true' do
+          expect( subject.run_in_parallel?({:run_in_parallel => true}, nil, nil) ).to be === true
+        end
+
+        it 'returns false if :run_in_parallel in opts is false' do
+          expect( subject.run_in_parallel?({:run_in_parallel => false}, nil, nil) ).to be === false
+        end
+
+        it 'returns false if :run_in_parallel in opts is an empty array' do
+          expect( subject.run_in_parallel?({:run_in_parallel => []}, nil, nil) ).to be === false
+        end
+
+        it 'returns false if :run_in_parallel in opts is an empty array but a mode is specified in options' do
+          expect( subject.run_in_parallel?({:run_in_parallel => []}, {:run_in_parallel => ['install']}, 'install') ).to be === false
+        end
+
+        it 'returns true if opts is nil but a matching mode is specified in options' do
+          expect( subject.run_in_parallel?(nil, {:run_in_parallel => ['install']}, 'install') ).to be === true
+        end
+
+        it 'returns false if opts is nil and a non matching mode is specified in options' do
+          expect( subject.run_in_parallel?(nil, {:run_in_parallel => ['configure']}, 'install') ).to be === false
+        end
+
+        it 'returns true if opts is nil and a matching mode and a non matching mode is specified in options' do
+          expect( subject.run_in_parallel?(nil, {:run_in_parallel => ['configure', 'install']}, 'install') ).to be === true
+        end
+
+        it 'returns false if opts is nil and no mode is specified in options' do
+          expect( subject.run_in_parallel?(nil, {:run_in_parallel => []}, 'install') ).to be === false
+        end
+
+        it 'returns false if opts is false but a matching mode is specified in options' do
+          expect( subject.run_in_parallel?({:run_in_parallel => false}, {:run_in_parallel => ['install']}, 'install') ).to be === false
+        end
+
+      end
+    end
+  end
+end

data/spec/beaker/test_case_spec.rb

@@ -49,7 +49,7 @@ module Beaker
           f.write "raise FailTest"
         end
         @path = path
-        expect( testcase ).to_not receive( :log_and_fail_test )
+        expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Beaker::DSL::FailTest), :fail).and_call_original
         testcase.run_test
         status = testcase.instance_variable_get(:@test_status)
         expect(status).to be === :fail
@@ -105,8 +105,26 @@ module Beaker
           EOF
         end
         @path = path
-        expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Minitest::Assertion))
+        expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Minitest::Assertion), :teardown_error).and_call_original
+        testcase.run_test
+        expect @test_status == :error
+      end
+
+      it 'does not overwrite a test failure if an assertion also happens in a teardown block' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write <<-EOF
+            teardown do
+              assert_equal(1, 2, 'Oh noes!')
+            end
+            assert_equal(true, false, 'failed test')
+          EOF
+        end
+        @path = path
+        expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Minitest::Assertion), :fail).and_call_original
+        expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Minitest::Assertion), :teardown_error).and_call_original
         testcase.run_test
+        expect @test_status == :fail
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.48.1
+  version: 2.49.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -551,6 +551,7 @@ files:
 - 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_prebuilt_steps/ssh_environment_test.rb
 - acceptance/tests/base/host_test.rb
 - acceptance/tests/base/packages.rb
@@ -573,10 +574,12 @@ files:
 - docs/concepts/masterless_puppet.md
 - docs/concepts/roles_what_are_they.md
 - docs/concepts/shared_options_for_executing_beaker_commands.md
+- docs/concepts/style_guide.md
 - docs/concepts/test_tagging.md
 - docs/concepts/ticket_process.md
 - docs/concepts/types_puppet_4_and_the_all_in_one_agent.md
 - docs/how_to/access_the_live_test_console_with_pry.md
+- docs/how_to/archive_sut_files.md
 - docs/how_to/change_terminal_output_coloring.md
 - docs/how_to/confine.md
 - docs/how_to/hosts/README.md
@@ -598,6 +601,7 @@ files:
 - docs/how_to/rake_tasks.md
 - docs/how_to/recipes.md
 - docs/how_to/run_in_parallel.md
+- docs/how_to/ssh_agent_forwarding.md
 - docs/how_to/the_beaker_dsl.md
 - docs/how_to/use_user_password_authentication.md
 - docs/how_to/write_a_beaker_test_for_a_module.md
@@ -710,6 +714,7 @@ files:
 - lib/beaker/shared.rb
 - lib/beaker/shared/error_handler.rb
 - lib/beaker/shared/host_manager.rb
+- lib/beaker/shared/options_resolver.rb
 - lib/beaker/shared/repetition.rb
 - lib/beaker/shared/semvar.rb
 - lib/beaker/shared/timed.rb
@@ -797,6 +802,7 @@ files:
 - spec/beaker/platform_spec.rb
 - spec/beaker/shared/error_handler_spec.rb
 - spec/beaker/shared/host_manager_spec.rb
+- spec/beaker/shared/options_resolver_spec.rb
 - spec/beaker/shared/repetition_spec.rb
 - spec/beaker/shared/semvar_spec.rb
 - spec/beaker/ssh_connection_spec.rb