Skip to content

(maint) Reset facter search path when resetting facts #628

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 11, 2014
Merged

(maint) Reset facter search path when resetting facts #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions lib/facter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ def self.clear
# @api public
def self.reset
@collection = nil
reset_search_path!
end

# Loads all facts.
Expand All @@ -195,8 +196,6 @@ def self.loadfacts
collection.load_all
end

@search_path = []

# Register directories to be searched for facts. The registered directories
# must be absolute paths or they will be ignored.
#
Expand All @@ -218,6 +217,16 @@ def self.search_path
@search_path.dup
end

# Reset the Facter search directories.
#
# @api private
# @return [void]
def self.reset_search_path!
@search_path = []
end

reset_search_path!

# Registers directories to be searched for external facts.
#
# @param dirs [Array<String>] directories to search
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/facter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
end

describe "when registering directories to search" do
after { Facter.instance_variable_set("@search_path", []) }
after { Facter.reset_search_path! }

it "should allow registration of a directory" do
Facter.search "/my/dir"
Expand Down