(PUP-4659) Update environment tests #4012
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
Previously, the tests failed when the master had the agent role. This wasn't noticed originally due to PUP-4111. We also stopped testing the agent role on the master in the lead up to Puppet 4, so once PUP-4111 was fixed, we didn't see the problem in platform CI. But puppetserver CI does test that combination and was failing. This commit changes the following environment scenarios: bad: Changes the expectation to match the non-existent environmentpath specified in the main section of puppet.conf default: Calls the `use_an_environment` method passing in a nil environment, so that the various puppet commands don't specify `--environment` on the command line. ALso changes the expectation to match the default environment `production` in the resulting output, e.g. Preparing to install into /etc/puppetlabs/code/environments/production/modules master_environmentpath: The test tried to set an environmentpath in the master section of puppet.conf, which wasn't different than the default, and verify that non-master puppet commands, e.g. `puppet apply` would fail. This commit changes the test to use a non-default environment path for the master section only, and verify that the various puppet commands don't "see" that directory. [skip ci]
Minor cleanup to environment related acceptance tests. Removed unused notify resource, added a teardown to ensure the agent's libdir is deleted if the assert_match fails, and uses the `Host#puppet` method to return the `user` that he master runs as. [skip ci]
|
Here's the output when all of the |
|
@er0ck for your review |
|
oops. totally forgot to tackle this myself, last week. checking against ubuntu14 |
|
CLA signed by all contributors. |
|
👍 |
er0ck
added a commit
that referenced
this pull request
Jun 9, 2015
…onment-tests (PUP-4659) Update environment tests
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.
Previously, the tests failed when the master had the agent role. This
wasn't noticed originally due to PUP-4111. We also stopped testing the
agent role on the master in the lead up to Puppet 4, so once PUP-4111
was fixed, we didn't see the problem in platform CI. But puppetserver CI
does test that combination and was failing.
These commits update some of the environment related tests to
match the current and expected behavior.