puppet 2.7.3 → 2.7.4

data/spec/unit/file_serving/configuration_spec.rb

@@ -4,42 +4,31 @@ require 'spec_helper'
 require 'puppet/file_serving/configuration'
 
 describe Puppet::FileServing::Configuration do
-  it "should make :new a private method" do
-    proc { Puppet::FileServing::Configuration.new }.should raise_error
-  end
-
-  it "should return the same configuration each time :create is called" do
-    Puppet::FileServing::Configuration.create.should equal(Puppet::FileServing::Configuration.create)
-  end
-
-  it "should have a method for removing the current configuration instance" do
-    old = Puppet::FileServing::Configuration.create
-    Puppet::Util::Cacher.expire
-    Puppet::FileServing::Configuration.create.should_not equal(old)
-  end
-
-  after do
-    Puppet::Util::Cacher.expire
-  end
-end
-
-describe Puppet::FileServing::Configuration do
+  include PuppetSpec::Files
 
   before :each do
-    @path = "/path/to/configuration/file.conf"
+    @path = make_absolute("/path/to/configuration/file.conf")
     Puppet.settings.stubs(:value).with(:trace).returns(false)
     Puppet.settings.stubs(:value).with(:fileserverconfig).returns(@path)
   end
 
   after :each do
-    Puppet::Util::Cacher.expire
+    Puppet::FileServing::Configuration.instance_variable_set(:@configuration, nil)
+  end
+
+  it "should make :new a private method" do
+    proc { Puppet::FileServing::Configuration.new }.should raise_error
+  end
+
+  it "should return the same configuration each time 'configuration' is called" do
+    Puppet::FileServing::Configuration.configuration.should equal(Puppet::FileServing::Configuration.configuration)
   end
 
   describe "when initializing" do
 
     it "should work without a configuration file" do
       FileTest.stubs(:exists?).with(@path).returns(false)
-      proc { Puppet::FileServing::Configuration.create }.should_not raise_error
+      proc { Puppet::FileServing::Configuration.configuration }.should_not raise_error
     end
 
     it "should parse the configuration file if present" do
@@ -47,11 +36,11 @@ describe Puppet::FileServing::Configuration do
       @parser = mock 'parser'
       @parser.expects(:parse).returns({})
       Puppet::FileServing::Configuration::Parser.stubs(:new).returns(@parser)
-      Puppet::FileServing::Configuration.create
+      Puppet::FileServing::Configuration.configuration
     end
 
     it "should determine the path to the configuration file from the Puppet settings" do
-      Puppet::FileServing::Configuration.create
+      Puppet::FileServing::Configuration.configuration
     end
   end
 
@@ -65,18 +54,18 @@ describe Puppet::FileServing::Configuration do
 
     it "should set the mount list to the results of parsing" do
       @parser.expects(:parse).returns("one" => mock("mount"))
-      config = Puppet::FileServing::Configuration.create
+      config = Puppet::FileServing::Configuration.configuration
       config.mounted?("one").should be_true
     end
 
     it "should not raise exceptions" do
       @parser.expects(:parse).raises(ArgumentError)
-      proc { Puppet::FileServing::Configuration.create }.should_not raise_error
+      proc { Puppet::FileServing::Configuration.configuration }.should_not raise_error
     end
 
     it "should replace the existing mount list with the results of reparsing" do
       @parser.expects(:parse).returns("one" => mock("mount"))
-      config = Puppet::FileServing::Configuration.create
+      config = Puppet::FileServing::Configuration.configuration
       config.mounted?("one").should be_true
       # Now parse again
       @parser.expects(:parse).returns("two" => mock('other'))
@@ -88,7 +77,7 @@ describe Puppet::FileServing::Configuration do
     it "should not replace the mount list until the file is entirely parsed successfully" do
       @parser.expects(:parse).returns("one" => mock("mount"))
       @parser.expects(:parse).raises(ArgumentError)
-      config = Puppet::FileServing::Configuration.create
+      config = Puppet::FileServing::Configuration.configuration
       # Now parse again, so the exception gets thrown
       config.send(:readconfig, false)
       config.mounted?("one").should be_true
@@ -96,7 +85,7 @@ describe Puppet::FileServing::Configuration do
 
     it "should add modules and plugins mounts even if the file does not exist" do
       FileTest.expects(:exists?).returns false # the file doesn't exist
-      config = Puppet::FileServing::Configuration.create
+      config = Puppet::FileServing::Configuration.configuration
       config.mounted?("modules").should be_true
       config.mounted?("plugins").should be_true
     end
@@ -111,7 +100,7 @@ describe Puppet::FileServing::Configuration do
       Puppet::FileServing::Mount::Plugins.stubs(:new).returns(plugins)
       plugins.expects(:allow).with('*')
 
-      Puppet::FileServing::Configuration.create
+      Puppet::FileServing::Configuration.configuration
     end
 
     it "should not allow access from all to modules and plugins if the fileserver.conf provided some rules" do
@@ -125,13 +114,13 @@ describe Puppet::FileServing::Configuration do
       Puppet::FileServing::Mount::Plugins.stubs(:new).returns(plugins)
       plugins.expects(:allow).with('*').never
 
-      Puppet::FileServing::Configuration.create
+      Puppet::FileServing::Configuration.configuration
     end
 
     it "should add modules and plugins mounts even if they are not returned by the parser" do
       @parser.expects(:parse).returns("one" => mock("mount"))
       FileTest.expects(:exists?).returns true # the file doesn't exist
-      config = Puppet::FileServing::Configuration.create
+      config = Puppet::FileServing::Configuration.configuration
       config.mounted?("modules").should be_true
       config.mounted?("plugins").should be_true
     end
@@ -139,13 +128,13 @@ describe Puppet::FileServing::Configuration do
 
   describe "when finding the specified mount" do
     it "should choose the named mount if one exists" do
-      config = Puppet::FileServing::Configuration.create
+      config = Puppet::FileServing::Configuration.configuration
       config.expects(:mounts).returns("one" => "foo")
       config.find_mount("one", mock('env')).should == "foo"
     end
 
     it "should use the provided environment to find a matching module if the named module cannot be found" do
-      config = Puppet::FileServing::Configuration.create
+      config = Puppet::FileServing::Configuration.configuration
 
       mod = mock 'module'
       env = mock 'environment'
@@ -158,7 +147,7 @@ describe Puppet::FileServing::Configuration do
     end
 
     it "should return nil if there is no such named mount and no module with the same name exists" do
-      config = Puppet::FileServing::Configuration.create
+      config = Puppet::FileServing::Configuration.configuration
 
       env = mock 'environment'
       env.expects(:module).with("foo").returns nil
@@ -171,7 +160,7 @@ describe Puppet::FileServing::Configuration do
 
   describe "when finding the mount name and relative path in a request key" do
     before do
-      @config = Puppet::FileServing::Configuration.create
+      @config = Puppet::FileServing::Configuration.configuration
       @config.stubs(:find_mount)
 
       @request = stub 'request', :key => "foo/bar/baz", :options => {}, :node => nil, :environment => mock("env")

data/spec/unit/file_serving/fileset_spec.rb

@@ -4,6 +4,12 @@ require 'spec_helper'
 require 'puppet/file_serving/fileset'
 
 describe Puppet::FileServing::Fileset, " when initializing" do
+  include PuppetSpec::Files
+
+  before :each do
+    @somefile = make_absolute("/some/file")
+  end
+
   it "should require a path" do
     proc { Puppet::FileServing::Fileset.new }.should raise_error(ArgumentError)
   end
@@ -13,83 +19,82 @@ describe Puppet::FileServing::Fileset, " when initializing" do
   end
 
   it "should not fail if the path is fully qualified, with a trailing separator" do
-    path = "/some/path/with/trailing/separator"
-    path_with_separator = "#{path}#{File::SEPARATOR}"
-    File.stubs(:lstat).with(path).returns stub('stat')
+    path_with_separator = "#{@somefile}#{File::SEPARATOR}"
+    File.stubs(:lstat).with(@somefile).returns stub('stat')
     fileset = Puppet::FileServing::Fileset.new(path_with_separator)
-    fileset.path.should == path
+    fileset.path.should == @somefile
   end
 
   it "should not fail if the path is just the file separator" do
-    path = File::SEPARATOR
+    path = make_absolute(File::SEPARATOR)
     File.stubs(:lstat).with(path).returns stub('stat')
     fileset = Puppet::FileServing::Fileset.new(path)
     fileset.path.should == path
   end
 
   it "should fail if its path does not exist" do
-    File.expects(:lstat).with("/some/file").returns nil
-    proc { Puppet::FileServing::Fileset.new("/some/file") }.should raise_error(ArgumentError)
+    File.expects(:lstat).with(@somefile).returns nil
+    proc { Puppet::FileServing::Fileset.new(@somefile) }.should raise_error(ArgumentError)
   end
 
   it "should accept a 'recurse' option" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
-    set = Puppet::FileServing::Fileset.new("/some/file", :recurse => true)
+    File.expects(:lstat).with(@somefile).returns stub("stat")
+    set = Puppet::FileServing::Fileset.new(@somefile, :recurse => true)
     set.recurse.should be_true
   end
 
   it "should accept a 'recurselimit' option" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
-    set = Puppet::FileServing::Fileset.new("/some/file", :recurselimit => 3)
+    File.expects(:lstat).with(@somefile).returns stub("stat")
+    set = Puppet::FileServing::Fileset.new(@somefile, :recurselimit => 3)
     set.recurselimit.should == 3
   end
 
   it "should accept an 'ignore' option" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
-    set = Puppet::FileServing::Fileset.new("/some/file", :ignore => ".svn")
+    File.expects(:lstat).with(@somefile).returns stub("stat")
+    set = Puppet::FileServing::Fileset.new(@somefile, :ignore => ".svn")
     set.ignore.should == [".svn"]
   end
 
   it "should accept a 'links' option" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
-    set = Puppet::FileServing::Fileset.new("/some/file", :links => :manage)
+    File.expects(:lstat).with(@somefile).returns stub("stat")
+    set = Puppet::FileServing::Fileset.new(@somefile, :links => :manage)
     set.links.should == :manage
   end
 
   it "should accept a 'checksum_type' option" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
-    set = Puppet::FileServing::Fileset.new("/some/file", :checksum_type => :test)
+    File.expects(:lstat).with(@somefile).returns stub("stat")
+    set = Puppet::FileServing::Fileset.new(@somefile, :checksum_type => :test)
     set.checksum_type.should == :test
   end
 
   it "should fail if 'links' is set to anything other than :manage or :follow" do
-    proc { Puppet::FileServing::Fileset.new("/some/file", :links => :whatever) }.should raise_error(ArgumentError)
+    proc { Puppet::FileServing::Fileset.new(@somefile, :links => :whatever) }.should raise_error(ArgumentError)
   end
 
   it "should default to 'false' for recurse" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
-    Puppet::FileServing::Fileset.new("/some/file").recurse.should == false
+    File.expects(:lstat).with(@somefile).returns stub("stat")
+    Puppet::FileServing::Fileset.new(@somefile).recurse.should == false
   end
 
   it "should default to :infinite for recurselimit" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
-    Puppet::FileServing::Fileset.new("/some/file").recurselimit.should == :infinite
+    File.expects(:lstat).with(@somefile).returns stub("stat")
+    Puppet::FileServing::Fileset.new(@somefile).recurselimit.should == :infinite
   end
 
   it "should default to an empty ignore list" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
-    Puppet::FileServing::Fileset.new("/some/file").ignore.should == []
+    File.expects(:lstat).with(@somefile).returns stub("stat")
+    Puppet::FileServing::Fileset.new(@somefile).ignore.should == []
   end
 
   it "should default to :manage for links" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
-    Puppet::FileServing::Fileset.new("/some/file").links.should == :manage
+    File.expects(:lstat).with(@somefile).returns stub("stat")
+    Puppet::FileServing::Fileset.new(@somefile).links.should == :manage
   end
 
   it "should support using an Indirector Request for its options" do
-    File.expects(:lstat).with("/some/file").returns stub("stat")
+    File.expects(:lstat).with(@somefile).returns stub("stat")
     request = Puppet::Indirector::Request.new(:file_serving, :find, "foo")
-    lambda { Puppet::FileServing::Fileset.new("/some/file", request) }.should_not raise_error
+    lambda { Puppet::FileServing::Fileset.new(@somefile, request) }.should_not raise_error
   end
 
   describe "using an indirector request" do
@@ -97,40 +102,43 @@ describe Puppet::FileServing::Fileset, " when initializing" do
       File.stubs(:lstat).returns stub("stat")
       @values = {:links => :manage, :ignore => %w{a b}, :recurse => true, :recurselimit => 1234}
       @request = Puppet::Indirector::Request.new(:file_serving, :find, "foo")
+      @myfile = make_absolute("/my/file")
     end
 
     [:recurse, :recurselimit, :ignore, :links].each do |option|
       it "should pass :recurse, :recurselimit, :ignore, and :links settings on to the fileset if present" do
         @request.stubs(:options).returns(option => @values[option])
-        Puppet::FileServing::Fileset.new("/my/file", @request).send(option).should == @values[option]
+        Puppet::FileServing::Fileset.new(@myfile, @request).send(option).should == @values[option]
       end
 
       it "should pass :recurse, :recurselimit, :ignore, and :links settings on to the fileset if present with the keys stored as strings" do
         @request.stubs(:options).returns(option.to_s => @values[option])
-        Puppet::FileServing::Fileset.new("/my/file", @request).send(option).should == @values[option]
+        Puppet::FileServing::Fileset.new(@myfile, @request).send(option).should == @values[option]
       end
     end
 
     it "should convert the integer as a string to their integer counterpart when setting options" do
       @request.stubs(:options).returns(:recurselimit => "1234")
-      Puppet::FileServing::Fileset.new("/my/file", @request).recurselimit.should == 1234
+      Puppet::FileServing::Fileset.new(@myfile, @request).recurselimit.should == 1234
     end
 
     it "should convert the string 'true' to the boolean true when setting options" do
       @request.stubs(:options).returns(:recurse => "true")
-      Puppet::FileServing::Fileset.new("/my/file", @request).recurse.should == true
+      Puppet::FileServing::Fileset.new(@myfile, @request).recurse.should == true
     end
 
     it "should convert the string 'false' to the boolean false when setting options" do
       @request.stubs(:options).returns(:recurse => "false")
-      Puppet::FileServing::Fileset.new("/my/file", @request).recurse.should == false
+      Puppet::FileServing::Fileset.new(@myfile, @request).recurse.should == false
     end
   end
 end
 
 describe Puppet::FileServing::Fileset, " when determining whether to recurse" do
+  include PuppetSpec::Files
+
   before do
-    @path = "/my/path"
+    @path = make_absolute("/my/path")
     File.expects(:lstat).with(@path).returns stub("stat")
     @fileset = Puppet::FileServing::Fileset.new(@path)
   end
@@ -166,8 +174,10 @@ describe Puppet::FileServing::Fileset, " when determining whether to recurse" do
 end
 
 describe Puppet::FileServing::Fileset, " when recursing" do
+  include PuppetSpec::Files
+
   before do
-    @path = "/my/path"
+    @path = make_absolute("/my/path")
     File.expects(:lstat).with(@path).returns stub("stat", :directory? => true)
     @fileset = Puppet::FileServing::Fileset.new(@path)
 
@@ -257,7 +267,7 @@ describe Puppet::FileServing::Fileset, " when recursing" do
   end
 
   it "should succeed when paths have regexp significant characters" do
-    @path = "/my/path/rV1x2DafFr0R6tGG+1bbk++++TM"
+    @path = make_absolute("/my/path/rV1x2DafFr0R6tGG+1bbk++++TM")
     File.expects(:lstat).with(@path).returns stub("stat", :directory? => true)
     @fileset = Puppet::FileServing::Fileset.new(@path)
     mock_dir_structure(@path)
@@ -267,8 +277,10 @@ describe Puppet::FileServing::Fileset, " when recursing" do
 end
 
 describe Puppet::FileServing::Fileset, " when following links that point to missing files" do
+  include PuppetSpec::Files
+
   before do
-    @path = "/my/path"
+    @path = make_absolute("/my/path")
     File.expects(:lstat).with(@path).returns stub("stat", :directory? => true)
     @fileset = Puppet::FileServing::Fileset.new(@path)
     @fileset.links = :follow
@@ -291,8 +303,10 @@ describe Puppet::FileServing::Fileset, " when following links that point to miss
 end
 
 describe Puppet::FileServing::Fileset, " when ignoring" do
+  include PuppetSpec::Files
+
   before do
-    @path = "/my/path"
+    @path = make_absolute("/my/path")
     File.expects(:lstat).with(@path).returns stub("stat", :directory? => true)
     @fileset = Puppet::FileServing::Fileset.new(@path)
   end
@@ -318,8 +332,10 @@ describe Puppet::FileServing::Fileset, " when ignoring" do
 end
 
 describe Puppet::FileServing::Fileset, "when merging other filesets" do
+  include PuppetSpec::Files
+
   before do
-    @paths = %w{/first/path /second/path /third/path}
+    @paths = [make_absolute("/first/path"), make_absolute("/second/path"), make_absolute("/third/path")]
     File.stubs(:lstat).returns stub("stat", :directory? => false)
 
     @filesets = @paths.collect do |path|
@@ -331,32 +347,32 @@ describe Puppet::FileServing::Fileset, "when merging other filesets" do
   end
 
   it "should return a hash of all files in each fileset with the value being the base path" do
-    Dir.expects(:entries).with("/first/path").returns(%w{one uno})
-    Dir.expects(:entries).with("/second/path").returns(%w{two dos})
-    Dir.expects(:entries).with("/third/path").returns(%w{three tres})
+    Dir.expects(:entries).with(make_absolute("/first/path")).returns(%w{one uno})
+    Dir.expects(:entries).with(make_absolute("/second/path")).returns(%w{two dos})
+    Dir.expects(:entries).with(make_absolute("/third/path")).returns(%w{three tres})
 
     Puppet::FileServing::Fileset.merge(*@filesets).should == {
-      "." => "/first/path",
-      "one" => "/first/path",
-      "uno" => "/first/path",
-      "two" => "/second/path",
-      "dos" => "/second/path",
-      "three" => "/third/path",
-      "tres" => "/third/path",
+      "." => make_absolute("/first/path"),
+      "one" => make_absolute("/first/path"),
+      "uno" => make_absolute("/first/path"),
+      "two" => make_absolute("/second/path"),
+      "dos" => make_absolute("/second/path"),
+      "three" => make_absolute("/third/path"),
+      "tres" => make_absolute("/third/path"),
     }
   end
 
   it "should include the base directory from the first fileset" do
-    Dir.expects(:entries).with("/first/path").returns(%w{one})
-    Dir.expects(:entries).with("/second/path").returns(%w{two})
+    Dir.expects(:entries).with(make_absolute("/first/path")).returns(%w{one})
+    Dir.expects(:entries).with(make_absolute("/second/path")).returns(%w{two})
 
-    Puppet::FileServing::Fileset.merge(*@filesets)["."].should == "/first/path"
+    Puppet::FileServing::Fileset.merge(*@filesets)["."].should == make_absolute("/first/path")
   end
 
   it "should use the base path of the first found file when relative file paths conflict" do
-    Dir.expects(:entries).with("/first/path").returns(%w{one})
-    Dir.expects(:entries).with("/second/path").returns(%w{one})
+    Dir.expects(:entries).with(make_absolute("/first/path")).returns(%w{one})
+    Dir.expects(:entries).with(make_absolute("/second/path")).returns(%w{one})
 
-    Puppet::FileServing::Fileset.merge(*@filesets)["one"].should == "/first/path"
+    Puppet::FileServing::Fileset.merge(*@filesets)["one"].should == make_absolute("/first/path")
   end
 end

data/spec/unit/file_serving/indirection_hooks_spec.rb

@@ -1,8 +1,4 @@
 #!/usr/bin/env rspec
-#
-#  Created by Luke Kanies on 2007-10-18.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 
 require 'puppet/file_serving/indirection_hooks'