(BKR-1509) Beaker 4.0 Compatibility #62
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some beaker-puppet workflows do not "require 'beaker'" before beaker-puppet. We should not assume that beaker is already in the environment: since it's a dependency, a simple require statement will take care of this.
There's no need to extend/require any specific module paths in pre-suite files: they pull the DSL extensions just the same as test suites do.
Since configure_pe_defaults_on has moved to beaker-pe, we need to simulate that method's effects to test the invocation of remove_#{type}_defaults_on. In this case, it depends on host['type'] being set for all hosts.
mchllweeks
approved these changes
Aug 9, 2018
melissa
reviewed
Aug 9, 2018
| extend Beaker::DSL::InstallUtils | ||
|
|
||
| SourcePath = Beaker::DSL::InstallUtils::SourcePath | ||
| GitHubSig = Beaker::DSL::InstallUtils::GitHubSig |
There was a problem hiding this comment.
Do we not still need these references defined here?
There was a problem hiding this comment.
Nope. They're pulled into the DSL namespace, which is set up before pre-suite execution, so they're already available. In fact, these references aren't even complete, since they're relying on a previous chain of inclusion that no longer exists. Both of those constants are actually defined in FOSSUtils, which is included in the DSL here via DSL.register.
melissa
approved these changes
Aug 9, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Assorted fixes for running puppet/acceptance that weren't caught during acceptance testing due to CI configuration conflicts.