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

(SDK-232) Add operatingsystem_support defaults #58

Merged

Conversation

DavidS
Copy link
Contributor

@DavidS DavidS commented Jun 2, 2017

No description provided.

@DavidS DavidS force-pushed the sdk-232-operatingsystem-support branch 8 times, most recently from ed51756 to 664939a Compare June 5, 2017 13:55
@DavidS DavidS requested a review from james-stocks June 5, 2017 13:55
git_path = ENV['PDK_USE_SYSTEM_BINARIES'].nil? ? File.join(git_bindir, 'git') : 'git'
vendored_bin_path = File.join(git_bindir, 'git')
git_path = File.exists?(vendored_bin_path) ? vendored_bin_path : 'git'
PDK.logger.debug(_("Using git from the system PATH, instead of '%{vendored_bin_path}'") % { vendored_bin_path: vendored_bin_path})
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

Copy link
Contributor

Choose a reason for hiding this comment

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

@DavidS I know you mentioned the possibility of adding some sort of "don't fall back to system PATH" option for testing but maybe it would be sufficient to assert that the above DEBUG message isn't logged? No big deal either way.

"operatingsystem" => "Windows",
"operatingsystemrelease" => [ "2016" ]
},
]
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to be having all these operating systems set by default or interview for them?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They are easily discoverable, as this is used by rspec-puppet-facts. Once they are in here, they are easy to change. Interviewing for them sounds like more hassle than it's worth.

Copy link

@james-stocks james-stocks left a comment

Choose a reason for hiding this comment

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

LGTM but I'd like to check if acceptance tests still pass against packages; will try that out now

@scotje
Copy link
Contributor

scotje commented Jun 5, 2017

I didn't try actually running them yet but sounded like @james-stocks was going to try that. Code changes look good.

DavidS added 7 commits June 6, 2017 09:30
Instead of relying on user configuration, this change makes an automatic
fallback to the system PATH, if the vendored binary doesn't exist.
These are necessary to make rspec-puppet-facts work, and it is easier
for the developer to delete/modify what we get wrong there, than add a
new key.

This also adds very basic acceptance tests for the `new module` command.
@DavidS DavidS force-pushed the sdk-232-operatingsystem-support branch from 664939a to ca27451 Compare June 6, 2017 08:32
@DavidS
Copy link
Contributor Author

DavidS commented Jun 6, 2017

moved resolved pending example (via #63) to the normal test

Copy link

@james-stocks james-stocks left a comment

Choose a reason for hiding this comment

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

LGTM
The acceptance:package task fails for me but I believe that's because I'm using an outdated package - the errors I get indicate the acceptance spec is doing the right thing.

These tests also fail for me currently; but I believe it's an issue on my machine - I see these passing on appveyor and travis

@james-stocks james-stocks merged commit 5647270 into puppetlabs:master Jun 6, 2017
@DavidS DavidS deleted the sdk-232-operatingsystem-support branch June 6, 2017 11:57
@rodjek
Copy link
Contributor

rodjek commented Jun 6, 2017

@DavidS DavidS changed the title (SDK-232) operatingsystem_support, and serverspec acceptance testing (SDK-232) Add operatingsystem_support defaults Jun 16, 2017
@DavidS DavidS added the feature label Jun 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants