Skip to content

(maint) Handle different ssh service names in puppet resource service test#1620

Closed
nicklewis wants to merge 2 commits intopuppetlabs:masterfrom
nicklewis:fix-puppet-resource-service-test
Closed

(maint) Handle different ssh service names in puppet resource service test#1620
nicklewis wants to merge 2 commits intopuppetlabs:masterfrom
nicklewis:fix-puppet-resource-service-test

Conversation

@nicklewis
Copy link
Contributor

This test was using a regex to match the output for the ssh/sshd service
from puppet resource, but was explicitly invoking the command with the
name ssh. Since we can check the state of that service from the list of
all instances (in which case the regex is actually beneficial), there's
no need to look at the specific service separately. This combines the
two steps, and makes the test more robust to different names for the ssh
service.

@puppetcla
Copy link

CLA Signed by nicklewis on 2010-08-23 21:00:00 -0700

@jeffmccune
Copy link
Contributor

Ah, so I'm having difficulty rebasing this onto stable. Would you mind reverting the revert, then adding the fix? With the revert of the revert it should rebase cleanly onto stable.

Thanks,
-Jeff

…e` test

This test was using a regex to match the output for the ssh/sshd service
from puppet resource, but was explicitly invoking the command with the
name ssh. Since we can check the state of that service from the list of
all instances (in which case the regex is actually beneficial), there's
no need to look at the specific service separately. This combines the
two steps, and makes the test more robust to different names for the ssh
service.
@nicklewis
Copy link
Contributor Author

Reverted the revert and rebased off that. Should work now.

@jeffmccune
Copy link
Contributor

summary: Merged into stable and master as d4ced36. This should be released in Puppet 3.2. Thanks again for the contribution! This fix resolves the issue where by puppet runs dangerous init scripts on Debian which affect the system while checking the state of the system.

-Jeff

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants