Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(maint) Improve PCP broker and client usage in acceptance #336

Merged
merged 2 commits into from
Feb 12, 2016

Conversation

james-stocks
Copy link

A couple of minor improvements:

  • pcp-client should be set to debug loglevel if beaker is using debug logging
  • The pre-suite code should not have its own code for starting pcp-broker; especially now that the helper lib has code to test pcp-broker on startup

james-stocks added 2 commits February 12, 2016 11:19
…er method

010_Setup_Broker.rb and test_helper.rb contained duplicate code for running pcp-broker in trapperkeeper.
This commit changes 010_Setup_Broker.rb to use test_helper.rb's run_pcp_broker method
[skip ci]
@@ -6,6 +6,9 @@

# This file contains general test helper methods for pxp-agent acceptance tests

# The standard path for git checkouts is where pcp-broker will be
GIT_CLONE_FOLDER = '/opt/puppet-git-repos'
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not happy with this being defined here. I've created PCP-298 to refactor this lib - possibly at this point pcp-broker deserves its own helper file

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment says it's standard, so doesn't the place where it's standardised export a constant?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On checking out the branch and poking around I now follow - this is the standard place, as it's now common to the call to clone_git_repo_on in acceptance/setup/common/010_Setup_Broker.rb and the run_pcp_broker helper here. Will do for now.

richardc added a commit that referenced this pull request Feb 12, 2016
(maint) Improve PCP broker and client usage in acceptance
@richardc richardc merged commit c20417c into puppetlabs:stable Feb 12, 2016
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.

2 participants