1 files changed, 163 insertions, 169 deletions
diff --git a/spec/unit/file_serving/mount/file_spec.rb b/spec/unit/file_serving/mount/file_spec.rb
index 70c804abd..1ee004c10 100755
--- a/spec/unit/file_serving/mount/file_spec.rb
+++ b/spec/unit/file_serving/mount/file_spec.rb
@@ -10,12 +10,6 @@ module FileServingMountTesting
 end
 
 describe Puppet::FileServing::Mount::File do
-  it "should provide a method for clearing its cached host information" do
-    old = Puppet::FileServing::Mount::File.localmap
-    Puppet::Util::Cacher.expire
-    Puppet::FileServing::Mount::File.localmap.should_not equal(old)
-  end
-
   it "should be invalid if it does not have a path" do
     lambda { Puppet::FileServing::Mount::File.new("foo").validate }.should raise_error(ArgumentError)
   end
@@ -27,169 +21,169 @@ describe Puppet::FileServing::Mount::File do
     mount.path = "/foo"
     lambda { mount.validate }.should_not raise_error(ArgumentError)
   end
-end
-
-describe Puppet::FileServing::Mount::File, " when setting the path" do
-  before do
-    @mount = Puppet::FileServing::Mount::File.new("test")
-    @dir = "/this/path/does/not/exist"
-  end
-
-  it "should fail if the path is not a directory" do
-    FileTest.expects(:directory?).returns(false)
-    proc { @mount.path = @dir }.should raise_error(ArgumentError)
-  end
-
-  it "should fail if the path is not readable" do
-    FileTest.expects(:directory?).returns(true)
-    FileTest.expects(:readable?).returns(false)
-    proc { @mount.path = @dir }.should raise_error(ArgumentError)
-  end
-end
-
-describe Puppet::FileServing::Mount::File, " when substituting hostnames and ip addresses into file paths" do
-  include FileServingMountTesting
-
-  before do
-    FileTest.stubs(:directory?).returns(true)
-    FileTest.stubs(:readable?).returns(true)
-    @mount = Puppet::FileServing::Mount::File.new("test")
-    @host = "host.domain.com"
-  end
-
-  it "should replace incidences of %h in the path with the client's short name" do
-    @mount.path = "/dir/%h/yay"
-    @mount.path(@host).should == "/dir/host/yay"
-  end
-
-  it "should replace incidences of %H in the path with the client's fully qualified name" do
-    @mount.path = "/dir/%H/yay"
-    @mount.path(@host).should == "/dir/host.domain.com/yay"
-  end
-
-  it "should replace incidences of %d in the path with the client's domain name" do
-    @mount.path = "/dir/%d/yay"
-    @mount.path(@host).should == "/dir/domain.com/yay"
-  end
-
-  it "should perform all necessary replacements" do
-    @mount.path = "/%h/%d/%H"
-    @mount.path(@host).should == "/host/domain.com/host.domain.com"
-  end
-
-  it "should use local host information if no client data is provided" do
-    stub_facter("myhost.mydomain.com")
-    @mount.path = "/%h/%d/%H"
-    @mount.path.should == "/myhost/mydomain.com/myhost.mydomain.com"
-  end
-
-  after do
-    Puppet::Util::Cacher.expire
-  end
-end
-
-describe Puppet::FileServing::Mount::File, "when determining the complete file path" do
-  include FileServingMountTesting
-
-  before do
-    FileTest.stubs(:exist?).returns(true)
-    FileTest.stubs(:directory?).returns(true)
-    FileTest.stubs(:readable?).returns(true)
-    @mount = Puppet::FileServing::Mount::File.new("test")
-    @mount.path = "/mount"
-    stub_facter("myhost.mydomain.com")
-    @host = "host.domain.com"
-  end
-
-  it "should return nil if the file is absent" do
-    FileTest.stubs(:exist?).returns(false)
-    @mount.complete_path("/my/path", nil).should be_nil
-  end
-
-  it "should write a log message if the file is absent" do
-    FileTest.stubs(:exist?).returns(false)
-
-    Puppet.expects(:info).with("File does not exist or is not accessible: /mount/my/path")
-
-    @mount.complete_path("/my/path", nil)
-  end
-
-  it "should return the file path if the file is present" do
-    FileTest.stubs(:exist?).with("/my/path").returns(true)
-    @mount.complete_path("/my/path", nil).should == "/mount/my/path"
-  end
-
-  it "should treat a nil file name as the path to the mount itself" do
-    FileTest.stubs(:exist?).returns(true)
-    @mount.complete_path(nil, nil).should == "/mount"
-  end
-
-  it "should use the client host name if provided in the options" do
-    @mount.path = "/mount/%h"
-    @mount.complete_path("/my/path", @host).should == "/mount/host/my/path"
-  end
-
-  it "should perform replacements on the base path" do
-    @mount.path = "/blah/%h"
-    @mount.complete_path("/my/stuff", @host).should == "/blah/host/my/stuff"
-  end
-
-  it "should not perform replacements on the per-file path" do
-    @mount.path = "/blah"
-    @mount.complete_path("/%h/stuff", @host).should == "/blah/%h/stuff"
-  end
-
-  it "should look for files relative to its base directory" do
-    @mount.complete_path("/my/stuff", @host).should == "/mount/my/stuff"
-  end
-end
-
-describe Puppet::FileServing::Mount::File, "when finding files" do
-  include FileServingMountTesting
-
-  before do
-    FileTest.stubs(:exist?).returns(true)
-    FileTest.stubs(:directory?).returns(true)
-    FileTest.stubs(:readable?).returns(true)
-    @mount = Puppet::FileServing::Mount::File.new("test")
-    @mount.path = "/mount"
-    stub_facter("myhost.mydomain.com")
-    @host = "host.domain.com"
-
-    @request = stub 'request', :node => "foo"
-  end
-
-  it "should return the results of the complete file path" do
-    FileTest.stubs(:exist?).returns(false)
-    @mount.expects(:complete_path).with("/my/path", "foo").returns "eh"
-    @mount.find("/my/path", @request).should == "eh"
-  end
-end
-
-describe Puppet::FileServing::Mount::File, "when searching for files" do
-  include FileServingMountTesting
-
-  before do
-    FileTest.stubs(:exist?).returns(true)
-    FileTest.stubs(:directory?).returns(true)
-    FileTest.stubs(:readable?).returns(true)
-    @mount = Puppet::FileServing::Mount::File.new("test")
-    @mount.path = "/mount"
-    stub_facter("myhost.mydomain.com")
-    @host = "host.domain.com"
-
-    @request = stub 'request', :node => "foo"
-  end
-
-  it "should return the results of the complete file path as an array" do
-    FileTest.stubs(:exist?).returns(false)
-    @mount.expects(:complete_path).with("/my/path", "foo").returns "eh"
-    @mount.search("/my/path", @request).should == ["eh"]
-  end
 
-  it "should return nil if the complete path is nil" do
-    FileTest.stubs(:exist?).returns(false)
-    @mount.expects(:complete_path).with("/my/path", "foo").returns nil
-    @mount.search("/my/path", @request).should be_nil
+  describe "when setting the path" do
+    before do
+      @mount = Puppet::FileServing::Mount::File.new("test")
+      @dir = "/this/path/does/not/exist"
+    end
+
+    it "should fail if the path is not a directory" do
+      FileTest.expects(:directory?).returns(false)
+      proc { @mount.path = @dir }.should raise_error(ArgumentError)
+    end
+
+    it "should fail if the path is not readable" do
+      FileTest.expects(:directory?).returns(true)
+      FileTest.expects(:readable?).returns(false)
+      proc { @mount.path = @dir }.should raise_error(ArgumentError)
+    end
+  end
+
+  describe "when substituting hostnames and ip addresses into file paths" do
+    include FileServingMountTesting
+
+    before do
+      FileTest.stubs(:directory?).returns(true)
+      FileTest.stubs(:readable?).returns(true)
+      @mount = Puppet::FileServing::Mount::File.new("test")
+      @host = "host.domain.com"
+    end
+
+    after :each do
+      Puppet::FileServing::Mount::File.instance_variable_set(:@localmap, nil)
+    end
+
+    it "should replace incidences of %h in the path with the client's short name" do
+      @mount.path = "/dir/%h/yay"
+      @mount.path(@host).should == "/dir/host/yay"
+    end
+
+    it "should replace incidences of %H in the path with the client's fully qualified name" do
+      @mount.path = "/dir/%H/yay"
+      @mount.path(@host).should == "/dir/host.domain.com/yay"
+    end
+
+    it "should replace incidences of %d in the path with the client's domain name" do
+      @mount.path = "/dir/%d/yay"
+      @mount.path(@host).should == "/dir/domain.com/yay"
+    end
+
+    it "should perform all necessary replacements" do
+      @mount.path = "/%h/%d/%H"
+      @mount.path(@host).should == "/host/domain.com/host.domain.com"
+    end
+
+    it "should use local host information if no client data is provided" do
+      stub_facter("myhost.mydomain.com")
+      @mount.path = "/%h/%d/%H"
+      @mount.path.should == "/myhost/mydomain.com/myhost.mydomain.com"
+    end
+  end
+
+  describe "when determining the complete file path" do
+    include FileServingMountTesting
+
+    before do
+      FileTest.stubs(:exist?).returns(true)
+      FileTest.stubs(:directory?).returns(true)
+      FileTest.stubs(:readable?).returns(true)
+      @mount = Puppet::FileServing::Mount::File.new("test")
+      @mount.path = "/mount"
+      stub_facter("myhost.mydomain.com")
+      @host = "host.domain.com"
+    end
+
+    it "should return nil if the file is absent" do
+      FileTest.stubs(:exist?).returns(false)
+      @mount.complete_path("/my/path", nil).should be_nil
+    end
+
+    it "should write a log message if the file is absent" do
+      FileTest.stubs(:exist?).returns(false)
+
+      Puppet.expects(:info).with("File does not exist or is not accessible: /mount/my/path")
+
+      @mount.complete_path("/my/path", nil)
+    end
+
+    it "should return the file path if the file is present" do
+      FileTest.stubs(:exist?).with("/my/path").returns(true)
+      @mount.complete_path("/my/path", nil).should == "/mount/my/path"
+    end
+
+    it "should treat a nil file name as the path to the mount itself" do
+      FileTest.stubs(:exist?).returns(true)
+      @mount.complete_path(nil, nil).should == "/mount"
+    end
+
+    it "should use the client host name if provided in the options" do
+      @mount.path = "/mount/%h"
+      @mount.complete_path("/my/path", @host).should == "/mount/host/my/path"
+    end
+
+    it "should perform replacements on the base path" do
+      @mount.path = "/blah/%h"
+      @mount.complete_path("/my/stuff", @host).should == "/blah/host/my/stuff"
+    end
+
+    it "should not perform replacements on the per-file path" do
+      @mount.path = "/blah"
+      @mount.complete_path("/%h/stuff", @host).should == "/blah/%h/stuff"
+    end
+
+    it "should look for files relative to its base directory" do
+      @mount.complete_path("/my/stuff", @host).should == "/mount/my/stuff"
+    end
+  end
+
+  describe "when finding files" do
+    include FileServingMountTesting
+
+    before do
+      FileTest.stubs(:exist?).returns(true)
+      FileTest.stubs(:directory?).returns(true)
+      FileTest.stubs(:readable?).returns(true)
+      @mount = Puppet::FileServing::Mount::File.new("test")
+      @mount.path = "/mount"
+      stub_facter("myhost.mydomain.com")
+      @host = "host.domain.com"
+
+      @request = stub 'request', :node => "foo"
+    end
+
+    it "should return the results of the complete file path" do
+      FileTest.stubs(:exist?).returns(false)
+      @mount.expects(:complete_path).with("/my/path", "foo").returns "eh"
+      @mount.find("/my/path", @request).should == "eh"
+    end
+  end
+
+  describe "when searching for files" do
+    include FileServingMountTesting
+
+    before do
+      FileTest.stubs(:exist?).returns(true)
+      FileTest.stubs(:directory?).returns(true)
+      FileTest.stubs(:readable?).returns(true)
+      @mount = Puppet::FileServing::Mount::File.new("test")
+      @mount.path = "/mount"
+      stub_facter("myhost.mydomain.com")
+      @host = "host.domain.com"
+
+      @request = stub 'request', :node => "foo"
+    end
+
+    it "should return the results of the complete file path as an array" do
+      FileTest.stubs(:exist?).returns(false)
+      @mount.expects(:complete_path).with("/my/path", "foo").returns "eh"
+      @mount.search("/my/path", @request).should == ["eh"]
+    end
+
+    it "should return nil if the complete path is nil" do
+      FileTest.stubs(:exist?).returns(false)
+      @mount.expects(:complete_path).with("/my/path", "foo").returns nil
+      @mount.search("/my/path", @request).should be_nil
+    end
   end
 end