Maint/master/refactor ssl file #1252
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
Prior to this commit, the code for creating a model and loading it from a file was duplicated in two places. Also, the `renaming_files_with_uppercase` method was being called after the existence checks, complicating the logic. This commit moves the duplicate code to a single method. It also moves the `renaming...` method earlier, so that we get into a sane state as soon as possible. Finally, it adds a deprecation warning for some crazy behavior in the `rename_files_in_uppercase`. The `search` method may return an uppercase name, since it just walks the directory. But if `find` is called on the uppercase name, then the file gets lowercases, so that subsequent calls to `search` return the lowercased name. See #17307.
Previously, this would fail:
rspec --order random:786 spec/unit/indirector/ssl_file_spec.rb
because several of the examples set global state on the
Puppet::Indirector::SslFile class.
This commit adds an after each block to clean up.
Previously, the test was calling into the settings subsystem, which had
the undesirable effect of loading facter, and that generated errors
(though they weren't fatal) due to the expectation on FileTest
interferring with Facter's operatingsystem fact on debian6, at least.
Could not retrieve operatingsystem: unexpected invocation:
FileTest.exists?('/etc/debian_version')
This commit changes the test so that we don't calling into the settings
code.
zaphod42
added a commit
that referenced
this pull request
Nov 1, 2012
Maint/master/refactor ssl file
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.