puppet 0.24.6 → 0.24.7

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

@@ -0,0 +1,195 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe Puppet::Parser::AST::Definition, "when initializing" do
+end
+
+describe Puppet::Parser::AST::Definition, "when evaluating" do
+    before do
+        @type = Puppet::Parser::Resource
+        @parser = Puppet::Parser::Parser.new :Code => ""
+        @source = @parser.newclass ""
+        @definition = @parser.newdefine "mydefine"
+        @node = Puppet::Node.new("yaynode")
+        @compiler = Puppet::Parser::Compiler.new(@node, @parser)
+        @scope = @compiler.topscope
+
+        @resource = Puppet::Parser::Resource.new(:type => "mydefine", :title => "myresource", :scope => @scope, :source => @source)
+    end
+
+    it "should create a new scope" do
+        scope = nil
+        code = mock 'code'
+        code.expects(:safeevaluate).with do |scope|
+            scope.object_id.should_not == @scope.object_id
+            true
+        end
+        @definition.stubs(:code).returns(code)
+        @definition.evaluate_code(@resource)
+    end
+
+#    it "should copy its namespace to the scope"
+#
+#    it "should mark the scope virtual if the resource is virtual"
+#
+#    it "should mark the scope exported if the resource is exported"
+#
+#    it "should set the resource's parameters as variables in the scope"
+#
+#    it "should set the resource's title as a variable in the scope"
+#
+#    it "should copy the resource's title in a 'name' variable in the scope"
+#
+#    it "should not copy the resource's title as the name if 'name' is one of the resource parameters"
+#
+#    it "should evaluate the associated code with the new scope"
+
+    def old_test_initialize
+        parser = mkparser
+
+        # Create a new definition
+        klass = parser.newdefine "yayness",
+            :arguments => [["owner", stringobj("nobody")], %w{mode}],
+            :code => AST::ASTArray.new(
+                :children => [resourcedef("file", "/tmp/$name",
+                        "owner" => varref("owner"), "mode" => varref("mode"))]
+            )
+
+        # Test validattr? a couple different ways
+        [:owner, "owner", :schedule, "schedule"].each do |var|
+            assert(klass.validattr?(var), "%s was not considered valid" % var.inspect)
+        end
+
+        [:random, "random"].each do |var|
+            assert(! klass.validattr?(var), "%s was considered valid" % var.inspect)
+        end
+
+    end
+
+    def oldtest_evaluate
+        parser = mkparser
+        config = mkcompiler
+        config.send(:evaluate_main)
+        scope = config.topscope
+        klass = parser.newdefine "yayness",
+            :arguments => [["owner", stringobj("nobody")], %w{mode}],
+            :code => AST::ASTArray.new(
+                :children => [resourcedef("file", "/tmp/$name",
+                        "owner" => varref("owner"), "mode" => varref("mode"))]
+            )
+
+        resource = Puppet::Parser::Resource.new(
+            :title => "first",
+            :type => "yayness",
+            :exported => false,
+            :virtual => false,
+            :scope => scope,
+            :source => scope.source
+        )
+        resource.send(:set_parameter, "name", "first")
+        resource.send(:set_parameter, "mode", "755")
+
+        resource.stubs(:title)
+        assert_nothing_raised do
+            klass.evaluate_code(resource)
+        end
+
+        firstobj = config.findresource("File[/tmp/first]")
+        assert(firstobj, "Did not create /tmp/first obj")
+
+        assert_equal("File", firstobj.type)
+        assert_equal("/tmp/first", firstobj.title)
+        assert_equal("nobody", firstobj[:owner])
+        assert_equal("755", firstobj[:mode])
+
+        # Make sure we can't evaluate it with the same args
+        assert_raise(Puppet::ParseError) do
+            klass.evaluate_code(resource)
+        end
+
+        # Now create another with different args
+        resource2 = Puppet::Parser::Resource.new(
+            :title => "second",
+            :type => "yayness",
+            :exported => false,
+            :virtual => false,
+            :scope => scope,
+            :source => scope.source
+        )
+        resource2.send(:set_parameter, "name", "second")
+        resource2.send(:set_parameter, "mode", "755")
+        resource2.send(:set_parameter, "owner", "daemon")
+
+        assert_nothing_raised do
+            klass.evaluate_code(resource2)
+        end
+
+        secondobj = config.findresource("File[/tmp/second]")
+        assert(secondobj, "Did not create /tmp/second obj")
+
+        assert_equal("File", secondobj.type)
+        assert_equal("/tmp/second", secondobj.title)
+        assert_equal("daemon", secondobj[:owner])
+        assert_equal("755", secondobj[:mode])
+    end
+
+    # #539 - definitions should support both names and titles
+    def oldtest_names_and_titles
+        parser = mkparser
+        scope = mkscope :parser => parser
+
+        [
+            {:name => "one", :title => "two"},
+            {:title => "mytitle"}
+        ].each_with_index do |hash, i|
+            # Create a definition that uses both name and title.  Put this
+            # inside the loop so the subscope expectations work.
+            klass = parser.newdefine "yayness%s" % i
+
+            resource = Puppet::Parser::Resource.new(
+                :title => hash[:title],
+                :type => "yayness%s" % i,
+                :exported => false,
+                :virtual => false,
+                :scope => scope,
+                :source => scope.source
+            )
+
+            subscope = klass.subscope(scope, resource)
+
+            klass.expects(:subscope).returns(subscope)
+
+            if hash[:name]
+                resource.stubs(:to_hash).returns({:name => hash[:name]})
+            end
+
+            assert_nothing_raised("Could not evaluate definition with %s" % hash.inspect) do
+                klass.evaluate_code(resource)
+            end
+
+            name = hash[:name] || hash[:title]
+            title = hash[:title]
+
+            assert_equal(name, subscope.lookupvar("name"),
+                "Name did not get set correctly")
+            assert_equal(title, subscope.lookupvar("title"),
+                "title did not get set correctly")
+
+            [:name, :title].each do |param|
+                val = resource.send(param)
+                assert(subscope.tags.include?(val),
+                    "Scope was not tagged with %s '%s'" % [param, val])
+            end
+        end
+    end
+
+    # Testing the root cause of #615.  We should be using the fqname for the type, instead
+    # of just the short name.
+    def oldtest_fully_qualified_types
+        parser = mkparser
+        klass = parser.newclass("one::two")
+
+        assert_equal("one::two", klass.classname, "Class did not get fully qualified class name")
+    end
+end

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

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe Puppet::Parser::AST::Function do
+    before :each do
+        @scope = mock 'scope'
+    end
+
+    describe "when initializing" do
+        it "should not fail if the function doesn't exist" do
+            Puppet::Parser::Functions.stubs(:function).returns(false)
+
+            lambda{ Puppet::Parser::AST::Function.new :name => "dontexist" }.should_not raise_error(Puppet::ParseError)
+
+        end
+    end
+
+    describe "when evaluating" do
+
+        it "should fail if the function doesn't exist" do
+            Puppet::Parser::Functions.stubs(:function).returns(false)
+            func = Puppet::Parser::AST::Function.new :name => "dontexist"
+
+            lambda{ func.evaluate(@scope) }.should raise_error(Puppet::ParseError)
+        end
+
+        it "should fail if the function is a statement used as rvalue" do
+            Puppet::Parser::Functions.stubs(:function).with("exist").returns(true)
+            Puppet::Parser::Functions.stubs(:rvalue?).with("exist").returns(false)
+
+            func = Puppet::Parser::AST::Function.new :name => "exist", :ftype => :rvalue
+
+            lambda{ func.evaluate(@scope) }.should raise_error(Puppet::ParseError, "Function 'exist' does not return a value")
+        end
+
+        it "should fail if the function is an rvalue used as statement" do
+            Puppet::Parser::Functions.stubs(:function).with("exist").returns(true)
+            Puppet::Parser::Functions.stubs(:rvalue?).with("exist").returns(true)
+
+            func = Puppet::Parser::AST::Function.new :name => "exist", :ftype => :statement
+
+            lambda{ func.evaluate(@scope) }.should raise_error(Puppet::ParseError,"Function 'exist' must be the value of a statement")
+        end
+
+        it "should evaluate its arguments" do
+            argument = stub 'arg'
+            Puppet::Parser::Functions.stubs(:function).with("exist").returns(true)
+            func = Puppet::Parser::AST::Function.new :name => "exist", :ftype => :statement, :arguments => argument
+            @scope.stubs(:function_exist)
+
+            argument.expects(:safeevaluate).with(@scope).returns("argument")
+
+            func.evaluate(@scope)
+        end
+
+        it "should call the underlying ruby function" do
+            argument = stub 'arg', :safeevaluate => "nothing"
+            Puppet::Parser::Functions.stubs(:function).with("exist").returns(true)
+            func = Puppet::Parser::AST::Function.new :name => "exist", :ftype => :statement, :arguments => argument
+
+            @scope.expects(:function_exist).with("nothing")
+
+            func.evaluate(@scope)
+        end
+
+        it "should return the ruby function return for rvalue functions" do
+            argument = stub 'arg', :safeevaluate => "nothing"
+            Puppet::Parser::Functions.stubs(:function).with("exist").returns(true)
+            func = Puppet::Parser::AST::Function.new :name => "exist", :ftype => :statement, :arguments => argument
+            @scope.stubs(:function_exist).with("nothing").returns("returning")
+
+            func.evaluate(@scope).should == "returning"
+        end
+
+    end
+end

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

@@ -0,0 +1,148 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe Puppet::Parser::AST::HostClass do
+    before :each do
+        @node = Puppet::Node.new "testnode"
+        @parser = Puppet::Parser::Parser.new :environment => "development"
+        @scope_resource = stub 'scope_resource', :builtin? => true
+        @compiler = Puppet::Parser::Compiler.new(@node, @parser)
+
+        @scope = @compiler.topscope
+    end
+
+    describe Puppet::Parser::AST::HostClass, "when evaluating" do
+
+        before do
+            @top = @parser.newclass "top"
+            @middle = @parser.newclass "middle", :parent => "top"
+        end
+
+        it "should create a resource that references itself" do
+            @top.evaluate(@scope)
+
+            @compiler.catalog.resource(:class, "top").should be_instance_of(Puppet::Parser::Resource)
+        end
+
+        it "should evaluate the parent class if one exists" do
+            @middle.evaluate(@scope)
+
+            @compiler.catalog.resource(:class, "top").should be_instance_of(Puppet::Parser::Resource)
+        end
+
+        it "should fail to evaluate if a parent class is defined but cannot be found" do
+            othertop = @parser.newclass "something", :parent => "yay"
+            lambda { othertop.evaluate(@scope) }.should raise_error(Puppet::ParseError)
+        end
+
+        it "should not create a new resource if one already exists" do
+            @compiler.catalog.expects(:resource).with(:class, "top").returns("something")
+            @compiler.catalog.expects(:add_resource).never
+            @top.evaluate(@scope)
+        end
+
+        it "should return the existing resource when not creating a new one" do
+            @compiler.catalog.expects(:resource).with(:class, "top").returns("something")
+            @compiler.catalog.expects(:add_resource).never
+            @top.evaluate(@scope).should == "something"
+        end
+
+        it "should not create a new parent resource if one already exists and it has a parent class" do
+            @top.evaluate(@scope)
+
+            top_resource = @compiler.catalog.resource(:class, "top")
+
+            @middle.evaluate(@scope)
+
+            @compiler.catalog.resource(:class, "top").should equal(top_resource)
+        end
+
+        # #795 - tag before evaluation.
+        it "should tag the catalog with the resource tags when it is evaluated" do
+            @middle.evaluate(@scope)
+
+            @compiler.catalog.should be_tagged("middle")
+        end
+
+        it "should tag the catalog with the parent class tags when it is evaluated" do
+            @middle.evaluate(@scope)
+
+            @compiler.catalog.should be_tagged("top")
+        end
+    end
+
+    describe Puppet::Parser::AST::HostClass, "when evaluating code" do
+
+        before do
+            @top_resource = stub "top_resource"
+            @top = @parser.newclass "top", :code => @top_resource
+
+            @middle_resource = stub "middle_resource"
+            @middle = @parser.newclass "top::middle", :parent => "top", :code => @middle_resource
+        end
+
+        it "should set its namespace to its fully qualified name" do
+            @middle.namespace.should == "top::middle"
+        end
+
+        it "should evaluate the code referred to by the class" do
+            @top_resource.expects(:safeevaluate)
+
+            resource = @top.evaluate(@scope)
+
+            @top.evaluate_code(resource)
+        end
+
+        it "should evaluate the parent class's code if it has a parent" do
+            @top_resource.expects(:safeevaluate)
+            @middle_resource.expects(:safeevaluate)
+
+            resource = @middle.evaluate(@scope)
+
+            @middle.evaluate_code(resource)
+        end
+
+        it "should not evaluate the parent class's code if the parent has already been evaluated" do
+            @top_resource.stubs(:safeevaluate)
+            resource = @top.evaluate(@scope)
+            @top.evaluate_code(resource)
+
+            @top_resource.expects(:safeevaluate).never
+            @middle_resource.stubs(:safeevaluate)
+            resource = @middle.evaluate(@scope)
+            @middle.evaluate_code(resource)
+        end
+
+        it "should use the parent class's scope as its parent scope" do
+            @top_resource.stubs(:safeevaluate)
+            @middle_resource.stubs(:safeevaluate)
+            resource = @middle.evaluate(@scope)
+            @middle.evaluate_code(resource)
+
+            @compiler.class_scope(@middle).parent.should equal(@compiler.class_scope(@top))
+        end
+
+        it "should add the class's name and title to its own scope" do
+            @top_resource.stubs(:safeevaluate)
+            @middle_resource.stubs(:safeevaluate)
+            resource = @middle.evaluate(@scope)
+            scope = stub_everything 'scope', :compiler => @compiler
+            @middle.stubs(:subscope).returns(scope)
+
+            scope.expects(:setvar).with("title","top::middle")
+            scope.expects(:setvar).with("name","top::middle")
+
+            @middle.evaluate_code(resource)
+        end
+
+        it "should add the parent class's namespace to its namespace search path" do
+            @top_resource.stubs(:safeevaluate)
+            @middle_resource.stubs(:safeevaluate)
+            resource = @middle.evaluate(@scope)
+            @middle.evaluate_code(resource)
+
+            @compiler.class_scope(@middle).namespaces.should be_include(@top.namespace)
+        end
+    end
+end

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

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe Puppet::Parser::AST::Minus do
+    before :each do
+        @scope = Puppet::Parser::Scope.new()
+    end
+
+    it "should evaluate its argument" do
+        value = stub "value"
+        value.expects(:safeevaluate).with(@scope).returns(123)
+        
+        operator = Puppet::Parser::AST::Minus.new :value => value
+        operator.evaluate(@scope)
+    end
+
+    it "should fail if argument is not a string or integer" do
+        array_ast = stub 'array_ast', :safeevaluate => [2]
+        operator = Puppet::Parser::AST::Minus.new :value => array_ast
+        lambda { operator.evaluate(@scope) }.should raise_error
+    end
+
+    it "should work with integer as string" do
+        string = stub 'string', :safeevaluate => "123"
+        operator = Puppet::Parser::AST::Minus.new :value => string
+        operator.evaluate(@scope).should == -123
+    end
+
+    it "should work with integers" do
+        int = stub 'int', :safeevaluate => 123
+        operator = Puppet::Parser::AST::Minus.new :value => int
+        operator.evaluate(@scope).should == -123
+    end
+
+end