puppet 0.25.1 → 0.25.2

data/spec/unit/network/http/webrick.rb

@@ -15,7 +15,7 @@ end
 
 describe Puppet::Network::HTTP::WEBrick, "when turning on listening" do
     before do
-        @mock_webrick = stub('webrick', :[] => {})
+        @mock_webrick = stub('webrick', :[] => {}, :listeners => [], :status => :Running)
         [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}
         WEBrick::HTTPServer.stubs(:new).returns(@mock_webrick)
         @server = Puppet::Network::HTTP::WEBrick.new
@@ -162,7 +162,7 @@ end
 
 describe Puppet::Network::HTTP::WEBrick, "when turning off listening" do
     before do
-        @mock_webrick = stub('webrick', :[] => {})
+        @mock_webrick = stub('webrick', :[] => {}, :listeners => [], :status => :Running)
         [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}
         WEBrick::HTTPServer.stubs(:new).returns(@mock_webrick)
         @server = Puppet::Network::HTTP::WEBrick.new

data/spec/unit/network/rest_authconfig.rb

@@ -84,7 +84,7 @@ describe Puppet::Network::RestAuthConfig do
     end
 
     DEFAULT_ACL.each do |acl|
-        it "should insert #{acl} if not present" do
+        it "should insert #{acl[:acl]} if not present" do
             @authconfig.rights.stubs(:[]).returns(true)
             @authconfig.rights.stubs(:[]).with(acl[:acl]).returns(nil)
 
@@ -93,7 +93,7 @@ describe Puppet::Network::RestAuthConfig do
             @authconfig.insert_default_acl
         end
 
-        it "should not insert #{acl} if present" do
+        it "should not insert #{acl[:acl]} if present" do
             @authconfig.rights.stubs(:[]).returns(true)
             @authconfig.rights.stubs(:[]).with(acl).returns(true)
 

data/spec/unit/network/rights.rb

@@ -391,7 +391,7 @@ describe Puppet::Network::Rights do
             end
 
             it "should match as a regex" do
-                @acl.match?("this shoud work.rb").should_not be_nil
+                @acl.match?("this should work.rb").should_not be_nil
             end
 
             it "should return nil if no match" do

data/spec/unit/node/environment.rb

@@ -22,6 +22,10 @@ describe Puppet::Node::Environment do
         Puppet::Node::Environment.attr_ttl(:modules).should == Integer(Puppet[:filetimeout])
     end
 
+    it "should use the filetimeout for the ttl for the manifestdir" do
+        Puppet::Node::Environment.attr_ttl(:manifestdir).should == Integer(Puppet[:filetimeout])
+    end
+
     it "should use the default environment if no name is provided while initializing an environment" do
         Puppet.settings.expects(:value).with(:environment).returns("one")
         Puppet::Node::Environment.new().name.should == :one
@@ -39,45 +43,57 @@ describe Puppet::Node::Environment do
         Puppet::Node::Environment.new(:one).to_s.should == "one"
     end
 
-    it "should consider its module path to be the environment-specific modulepath setting" do
-        FileTest.stubs(:directory?).returns true
-        env = Puppet::Node::Environment.new("testing")
-        module_path = %w{/one /two}.join(File::PATH_SEPARATOR)
-        env.expects(:[]).with(:modulepath).returns module_path
+    [:modulepath, :manifestdir].each do |setting|
+        it "should validate the #{setting} directories" do
+            path = %w{/one /two}.join(File::PATH_SEPARATOR)
+
+            env = Puppet::Node::Environment.new("testing")
+            env.stubs(:[]).with(setting).returns path
+
+            env.expects(:validate_dirs).with(%w{/one /two})
+
+            env.send(setting)
+        end
+
+        it "should return the validated dirs for #{setting}" do
+            path = %w{/one /two}.join(File::PATH_SEPARATOR)
 
-        env.modulepath.should == %w{/one /two}
+            env = Puppet::Node::Environment.new("testing")
+            env.stubs(:[]).with(setting).returns path
+            env.stubs(:validate_dirs).returns %w{/one /two}
+
+            env.send(setting).should == %w{/one /two}
+        end
     end
 
     it "should prefix the value of the 'PUPPETLIB' environment variable to the module path if present" do
-        FileTest.stubs(:directory?).returns true
         Puppet::Util::Execution.withenv("PUPPETLIB" => %w{/l1 /l2}.join(File::PATH_SEPARATOR)) do
             env = Puppet::Node::Environment.new("testing")
             module_path = %w{/one /two}.join(File::PATH_SEPARATOR)
+            env.expects(:validate_dirs).with(%w{/l1 /l2 /one /two}).returns %w{/l1 /l2 /one /two}
             env.expects(:[]).with(:modulepath).returns module_path
 
             env.modulepath.should == %w{/l1 /l2 /one /two}
         end
     end
 
-    it "should not return non-directories in the module path" do
-        env = Puppet::Node::Environment.new("testing")
-        module_path = %w{/one /two}.join(File::PATH_SEPARATOR)
-        env.expects(:[]).with(:modulepath).returns module_path
+    describe "when validating modulepath or manifestdir directories" do
+        it "should not return non-directories" do
+            env = Puppet::Node::Environment.new("testing")
 
-        FileTest.expects(:directory?).with("/one").returns true
-        FileTest.expects(:directory?).with("/two").returns false
+            FileTest.expects(:directory?).with("/one").returns true
+            FileTest.expects(:directory?).with("/two").returns false
 
-        env.modulepath.should == %w{/one}
-    end
+            env.validate_dirs(%w{/one /two}).should == %w{/one}
+        end
 
-    it "should use the current working directory to fully-qualify unqualified paths" do
-        FileTest.stubs(:directory?).returns true
-        env = Puppet::Node::Environment.new("testing")
-        module_path = %w{/one two}.join(File::PATH_SEPARATOR)
-        env.expects(:[]).with(:modulepath).returns module_path
+        it "should use the current working directory to fully-qualify unqualified paths" do
+            FileTest.stubs(:directory?).returns true
+            env = Puppet::Node::Environment.new("testing")
 
-        two = File.join(Dir.getwd, "two")
-        env.modulepath.should == ["/one", two]
+            two = File.join(Dir.getwd, "two")
+            env.validate_dirs(%w{/one two}).should == ["/one", two]
+        end
     end
 
     describe "when modeling a specific environment" do
@@ -155,7 +171,7 @@ describe Puppet::Node::Environment do
                 env.expects(:modulepath).returns %w{/a}
                 Dir.expects(:entries).with("/a").returns %w{foo}
 
-                env.modules.should be_all{|mod| mod.environment == "testing" }
+                env.modules.each {|mod| mod.environment.should == env }
             end
 
             it "should cache the module list" do

data/spec/unit/other/selinux.rb

@@ -28,7 +28,7 @@ end
 describe Puppet::Type.type(:selboolean), " when manipulating booleans" do
     before :each do
         provider_class = Puppet::Type::Selboolean.provider(Puppet::Type::Selboolean.providers[0])
-        Puppet::Type::Selboolean.expects(:defaultprovider).returns provider_class
+        Puppet::Type::Selboolean.stubs(:defaultprovider).returns provider_class
 
         @bool = Puppet::Type::Selboolean.new(
             :name => "foo",
@@ -57,7 +57,7 @@ end
 describe Puppet::Type.type(:selmodule), " when checking policy modules" do
     before :each do
         provider_class = Puppet::Type::Selmodule.provider(Puppet::Type::Selmodule.providers[0])
-        Puppet::Type::Selmodule.expects(:defaultprovider).returns provider_class
+        Puppet::Type::Selmodule.stubs(:defaultprovider).returns provider_class
 
         @module = Puppet::Type::Selmodule.new(
             :name => "foo",

data/spec/unit/parameter.rb

@@ -44,6 +44,14 @@ describe Puppet::Parameter do
         @parameter.tags.should == %w{one two foo}
     end
 
+    it "should provide source_descriptors" do
+        @resource.expects(:line).returns 10
+        @resource.expects(:file).returns "file"
+        @resource.expects(:tags).returns %w{one two}
+        @resource.expects(:version).returns 50
+        @parameter.source_descriptors.should == {:tags=>["one", "two", "foo"], :path=>"//foo", :version=>50, :file => "file", :line => 10}
+    end
+
     describe "when returning the value" do
         it "should return nil if no value is set" do
             @parameter.value.should be_nil

data/spec/unit/parser/ast/leaf.rb

@@ -72,6 +72,15 @@ describe Puppet::Parser::AST::String do
     end
 end
 
+describe Puppet::Parser::AST::Variable do
+    describe "when converting to string" do
+        it "should transform its value to a variable" do
+            value = stub 'value', :is_a? => true, :to_s => "myvar"
+            Puppet::Parser::AST::Variable.new( :value => value ).to_s.should == "\$myvar"
+        end
+    end
+end
+
 describe Puppet::Parser::AST::Regex do
     before :each do
         @scope = stub 'scope'

data/spec/unit/parser/ast/selector.rb

@@ -151,6 +151,13 @@ describe Puppet::Parser::AST::Selector do
                 @selector.evaluate(@scope)
             end
         end
-
+    end
+    describe "when converting to string" do
+        it "should produce a string version of this selector" do
+            values = Puppet::Parser::AST::ASTArray.new :children => [ Puppet::Parser::AST::ResourceParam.new(:param => "type", :value => "value", :add => false) ]
+            param = Puppet::Parser::AST::Variable.new :value => "myvar"
+            selector = Puppet::Parser::AST::Selector.new :param => param, :values => values
+            selector.to_s.should == "$myvar ? { type => value }"
+        end
     end
 end

data/spec/unit/parser/lexer.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require 'puppet/parser/lexer'
 
 # This is a special matcher to match easily lexer output
-Spec::Matchers.create :be_like do |ary|
+Spec::Matchers.define :be_like do |ary|
     match do |result|
         r = true
         result.zip(ary) do |a,b|

data/spec/unit/parser/resource.rb

@@ -101,6 +101,17 @@ describe Puppet::Parser::Resource do
         end
     end
 
+    describe "when refering to a resource with name canonicalization" do
+        before do
+            @arguments = {:type => "file", :title => "/path/", :scope => stub('scope', :source => mock('source'))}
+        end
+
+        it "should canonicalize its own name" do
+            res = Puppet::Parser::Resource.new(@arguments)
+            res.ref.should == "File[/path]"
+        end
+    end
+
     describe "when evaluating" do
         before do
             @type = Puppet::Parser::Resource

data/spec/unit/parser/resource/reference.rb

@@ -40,10 +40,22 @@ describe Puppet::Parser::Resource::Reference do
         ref.to_s.should == "File[/tmp/yay]"
     end
 
-    it "should canonize resource references" do
+    it "should canonize resource reference types" do
         ref = @type.new(:type => "foo::bar", :title => "/tmp/yay")
         ref.to_s.should == "Foo::Bar[/tmp/yay]"
     end
+
+    it "should canonize resource reference values" do
+        ref = @type.new(:type => "file", :title => "/tmp/yay/")
+        ref.to_s.should == "File[/tmp/yay]"
+    end
+
+    it "should canonize resource reference values without order dependencies" do
+        args = [[:title, "/tmp/yay/"], [:type, "file"]]
+        ref = @type.new(args)
+        ref.to_s.should == "File[/tmp/yay]"
+    end
+
 end
 
 describe Puppet::Parser::Resource::Reference, " when modeling defined types" do

data/spec/unit/property.rb

@@ -101,6 +101,12 @@ describe Puppet::Property do
             @property.should.must == [:one, :two]
         end
 
+        it "should munge the canonicalization of the value" do
+            @property.class.to_canonicalize { |x| x.reverse }
+            @property.value = 'data'
+            @property.should.must == 'atad'
+        end
+
         it "should return any set value" do
             (@property.value = :one).should == :one
         end

data/spec/unit/provider/mount/parsed.rb

@@ -140,10 +140,12 @@ describe provider_class do
         end
 
         it "should write the mount to disk when :flush is called" do
+            old_text = @provider_class.target_object(@provider_class.default_target).read
+            
             @mount.flush
 
             text = @provider_class.target_object(@provider_class.default_target).read
-            text.should == @mount.class.to_line(@mount.property_hash) + "\n"
+            text.should == old_text + @mount.class.to_line(@mount.property_hash) + "\n"
         end
     end
 

data/spec/unit/provider/service/debian.rb

@@ -60,7 +60,7 @@ describe provider_class do
     
     describe "when checking whether it is enabled" do
         it "should call Kernel.system() with the appropriate parameters" do
-            @provider.expects(:system).with("/usr/sbin/invoke-rc.d", "--query", @resource[:name], "start").once
+            @provider.expects(:system).with("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start").once
             @provider.enabled?
         end
         

data/spec/unit/provider/ssh_authorized_key/parsed.rb

@@ -33,7 +33,7 @@ describe provider_class do
     end
 
     def genkey(key)
-        @provider.filetype = :ram
+        @provider.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)
         file = @provider.default_target
 
         key.flush
@@ -78,13 +78,21 @@ describe provider_class do
 
         @provider.parse_options(optionstr).should == options
     end
+
+    it "should use '' as name for entries that lack a comment" do
+        line = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAut8aOSxenjOqF527dlsdHWV4MNoAsX14l9M297+SQXaQ5Z3BedIxZaoQthkDALlV/25A1COELrg9J2MqJNQc8Xe9XQOIkBQWWinUlD/BXwoOTWEy8C8zSZPHZ3getMMNhGTBO+q/O+qiJx3y5cA4MTbw2zSxukfWC87qWwcZ64UUlegIM056vPsdZWFclS9hsROVEa57YUMrehQ1EGxT4Z5j6zIopufGFiAPjZigq/vqgcAqhAKP6yu4/gwO6S9tatBeEjZ8fafvj1pmvvIplZeMr96gHE7xS3pEEQqnB3nd4RY7AF6j9kFixnsytAUO7STPh/M3pLiVQBN89TvWPQ=="
+
+        @provider.parse(line)[0][:name].should == ""
+    end
 end
 
 describe provider_class do
     before :each do
         @resource = stub("resource", :name => "foo")
         @resource.stubs(:[]).returns "foo"
+
         @provider = provider_class.new(@resource)
+        provider_class.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)
     end
 
     describe "when flushing" do

data/spec/unit/provider/sshkey/parsed.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+provider_class = Puppet::Type.type(:sshkey).provider(:parsed)
+
+describe provider_class do
+    before do
+        @sshkey_class = Puppet::Type.type(:sshkey)
+        @provider_class = @sshkey_class.provider(:parsed)
+    end
+
+    it "should not drop an empty alias" do 
+        line = 'test,alias, ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzwHhxXvIrtfIwrudFqc8yQcIfMudrgpnuh1F3AV6d2BrLgu/yQE7W5UyJMUjfj427sQudRwKW45O0Jsnr33F4mUw+GIMlAAmp9g24/OcrTiB8ZUKIjoPy/cO4coxGi8/NECtRzpD/ZUPFh6OEpyOwJPMb7/EC2Az6Otw4StHdXUYw22zHazBcPFnv6zCgPx1hA7QlQDWTu4YcL0WmTYQCtMUb3FUqrcFtzGDD0ytosgwSd+JyN5vj5UwIABjnNOHPZ62EY1OFixnfqX/+dUwrFSs5tPgBF/KkC6R7tmbUfnBON6RrGEmu+ajOTOLy23qUZB4CQ53V7nyAWhzqSK+hw=='
+        parsed = @provider_class.parse_line(line)
+        parsed[:alias].should == ["alias",""]
+    end
+
+end

data/spec/unit/rails.rb

@@ -39,13 +39,24 @@ describe Puppet::Rails, "when initializing any connection" do
         ActiveRecord::Base.stubs(:logger).returns(logger)
         logger.expects(:level=).with(Logger::DEBUG)
 
+        ActiveRecord::Base.stubs(:allow_concurrency=)
         ActiveRecord::Base.stubs(:verify_active_connections!)
         ActiveRecord::Base.stubs(:establish_connection)
-        Puppet::Rails.stubs(:database_arguments)
+        Puppet::Rails.stubs(:database_arguments).returns({})
 
         Puppet::Rails.connect
     end
 
+    describe "on ActiveRecord 2.1.x" do
+        confine "ActiveRecord 2.1.x" => (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR <= 1)
+
+        it "should set ActiveRecord::Base.allow_concurrency" do
+            ActiveRecord::Base.expects(:allow_concurrency=).with(true)
+
+            Puppet::Rails.connect
+        end
+    end
+
     it "should call ActiveRecord::Base.verify_active_connections!" do
         ActiveRecord::Base.expects(:verify_active_connections!)
 
@@ -53,7 +64,7 @@ describe Puppet::Rails, "when initializing any connection" do
     end
 
     it "should call ActiveRecord::Base.establish_connection with database_arguments" do
-        Puppet::Rails.expects(:database_arguments)
+        Puppet::Rails.expects(:database_arguments).returns({})
         ActiveRecord::Base.expects(:establish_connection)
 
         Puppet::Rails.connect
@@ -63,15 +74,15 @@ end
 describe Puppet::Rails, "when initializing a sqlite3 connection" do
     confine "Cannot test without ActiveRecord" => Puppet.features.rails?
 
-    it "should provide the adapter, log_level, and dbfile arguments" do
+    it "should provide the adapter, log_level, and database arguments" do
         Puppet.settings.expects(:value).with(:dbadapter).returns("sqlite3")
         Puppet.settings.expects(:value).with(:rails_loglevel).returns("testlevel")
         Puppet.settings.expects(:value).with(:dblocation).returns("testlocation")
 
         Puppet::Rails.database_arguments.should == {
-            :adapter => "sqlite3",
+            :adapter   => "sqlite3",
             :log_level => "testlevel",
-            :dbfile => "testlocation"
+            :database  => "testlocation"
         }
     end
 end
@@ -79,7 +90,7 @@ end
 describe Puppet::Rails, "when initializing a mysql or postgresql connection" do
     confine "Cannot test without ActiveRecord" => Puppet.features.rails?
 
-    it "should provide the adapter, log_level, and host, username, password, and database arguments" do
+    it "should provide the adapter, log_level, and host, username, password, database, and reconnect arguments" do
         Puppet.settings.stubs(:value).with(:dbadapter).returns("mysql")
         Puppet.settings.stubs(:value).with(:rails_loglevel).returns("testlevel")
         Puppet.settings.stubs(:value).with(:dbserver).returns("testserver")
@@ -94,11 +105,12 @@ describe Puppet::Rails, "when initializing a mysql or postgresql connection" do
             :host => "testserver",
             :username => "testuser",
             :password => "testpassword",
-            :database => "testname"
+            :database => "testname",
+            :reconnect => true
         }
     end
 
-    it "should provide the adapter, log_level, and host, username, password, database, and socket arguments" do
+    it "should provide the adapter, log_level, and host, username, password, database, socket, and reconnect arguments" do
         Puppet.settings.stubs(:value).with(:dbadapter).returns("mysql")
         Puppet.settings.stubs(:value).with(:rails_loglevel).returns("testlevel")
         Puppet.settings.stubs(:value).with(:dbserver).returns("testserver")
@@ -114,7 +126,8 @@ describe Puppet::Rails, "when initializing a mysql or postgresql connection" do
             :username => "testuser",
             :password => "testpassword",
             :database => "testname",
-            :socket => "testsocket"
+            :socket => "testsocket",
+            :reconnect => true
         }
     end
 end

data/spec/unit/rails/resource.rb

@@ -84,4 +84,24 @@ describe "Puppet::Rails::Resource" do
             @resource.merge_parser_resource(@parser)
         end
     end
+
+    describe "merge_parameters" do
+        it "should replace values that have changed" do
+            @resource = Puppet::Rails::Resource.new
+            @resource.params_list = [{"name" => "replace", "value" => 1, "id" => 100 }]
+
+            Puppet::Rails::ParamValue.expects(:delete).with([100])
+            param_values = stub "param_values"
+            param_values.expects(:build).with({:value=>nil, :param_name=>nil, :line=>{"replace"=>2}})
+            @resource.stubs(:param_values).returns(param_values)
+
+            Puppet::Rails::ParamName.stubs(:accumulate_by_name)
+
+            merge_resource = stub "merge_resource"
+            merge_resource.expects(:line).returns({ "replace" => 2 })
+            merge_resource.stubs(:each).yields([["replace", 2]])
+
+            @resource.merge_parameters(merge_resource)
+        end
+    end
 end