diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-07-21 11:36:03 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:55 -0700 |
| commit | 8d530906490d5e2fafadd60a7f1699ef1d37b211 (patch) | |
| tree | 20153bc73cb60fe6d3020d328a74bb9f35710e80 /spec/integration | |
| parent | 3093047e07bdc69222c26d11aff50353f64c977d (diff) | |
| download | puppet-8d530906490d5e2fafadd60a7f1699ef1d37b211.tar.gz puppet-8d530906490d5e2fafadd60a7f1699ef1d37b211.tar.xz puppet-8d530906490d5e2fafadd60a7f1699ef1d37b211.zip | |
Remove use of Util::Cacher in FileServing::Configuration
This class was using Util::Cacher for its singleton instance, when that was
unnecessary. The FileServing::Configuration instance already manages whether or
not to reparse its config file, based on whether it has changed. Thus, there is
no need for it to be manually expired via the cacher.
Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
(cherry picked from commit 4bad729f56c26d8154cd0f20614fa4e478de9d40)
Diffstat (limited to 'spec/integration')
| -rwxr-xr-x | spec/integration/indirector/file_content/file_server_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/integration/indirector/file_content/file_server_spec.rb b/spec/integration/indirector/file_content/file_server_spec.rb index c068d76d5..3be32754f 100755 --- a/spec/integration/indirector/file_content/file_server_spec.rb +++ b/spec/integration/indirector/file_content/file_server_spec.rb @@ -13,6 +13,7 @@ describe Puppet::Indirector::FileContent::FileServer, " when finding files", :fa before do @terminus = Puppet::Indirector::FileContent::FileServer.new @test_class = Puppet::FileServing::Content + Puppet::FileServing::Configuration.instance_variable_set(:@configuration, nil) end it "should find plugin file content in the environment specified in the request" do @@ -58,7 +59,6 @@ describe Puppet::Indirector::FileContent::FileServer, " when finding files", :fa end it "should find file content in files when node name expansions are used" do - Puppet::Util::Cacher.expire FileTest.stubs(:exists?).returns true FileTest.stubs(:exists?).with(Puppet[:fileserverconfig]).returns(true) |