Pup 3997 clean logdir #3692
Closed
Pup 3997 clean logdir #3692
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
added 2 commits
March 7, 2015 21:06
This commit alters the default user and group parameter settings
in the create_test_file method of the Puppet::Acceptance::TempFileUtils
module.
If the host is a master, the value of `puppet config print {user,group}`
are used. Otherwise, the appropriate root user and group for the host's
platform are used.
This commit adds a get_file_manifest helper to the Puppet::Acceptance::TempFileUtils module. It also modifies acceptance tests that were impacting the state of the `logdir` on SUTs to use this helper to return the state of this file resource to its original state.
|
CLA signed by all contributors. |
| teardown do | ||
| on(agent, puppet('config', 'set', 'logdir', "'#{logdir} { owner = root, group = root, mode = 0700 }'", '--confdir', get_test_file_path(agent, ''))) | ||
| on(agent, puppet("apply -e \"#{logdir_orig}\"")) | ||
| end |
There was a problem hiding this comment.
@johnduarte I'm not following why these changes are necessary. Previously, the test created a temp confdir, and pointed logdir to another tempdir:
logdir = get_test_file_path(agent, 'log')
...
on(agent, puppet('config', 'set', 'logdir', "'#{logdir} { owner = root, group = root, mode = 0700 }'", '--confdir', get_test_file_path(agent, '')))
Then it executed puppet apply with the temp confdir:
on(agent, puppet('apply', get_test_file_path(agent, 'site.pp'), '--confdir', get_test_file_path(agent, '')))
So I would expect puppet to use the temp logdir specified in the temp confdir
|
So I don't think this PR addressed the order dependent failures that caused us to revert. I reverted the revert ( |
| options[:owner] = 'root' | ||
| end | ||
| end | ||
| end |
There was a problem hiding this comment.
👍 to this part, as it eliminates things like ed7e048
|
@johnduarte I included commit 18954ba in PR #3698, and dropped the other one as it was unused. |
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.
No description provided.