puppet 0.22.4 → 0.23.0

data/test/ral/types/package.rb

@@ -4,6 +4,7 @@ $:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'facter'
+require 'mocha'
 
 $platform = Facter["operatingsystem"].value
 
@@ -11,7 +12,6 @@ class TestPackages < Test::Unit::TestCase
     include PuppetTest::FileTesting
     def setup
         super
-        #@list = Puppet.type(:package).getpkglist
         Puppet.type(:package).clear
         @type = Puppet::Type.type(:package)
     end
@@ -21,7 +21,7 @@ class TestPackages < Test::Unit::TestCase
         @type.provide :fake, :parent => PuppetTest::FakeProvider do
             apimethods :ensure
             def install
-                self.ensure = @model.should(:ensure)
+                self.ensure = @resource.should(:ensure)
             end
 
             def uninstall
@@ -43,11 +43,13 @@ class TestPackages < Test::Unit::TestCase
         end
         assert(pkg, "did not create package")
 
+        current_values = nil
         assert_nothing_raised do
-            pkg.retrieve
+            current_values = pkg.retrieve
         end
 
-        assert_equal(:absent, pkg.is(:ensure), "package not considered missing")
+        assert_equal(:absent, current_values[pkg.property(:ensure)], 
+                     "package not considered missing")
         assert_equal(:present, pkg.should(:ensure),
             "package did not default to installed")
 
@@ -80,6 +82,61 @@ class TestPackages < Test::Unit::TestCase
                 "Incorrect default package format")
         end
     end
+
+    # Make sure we can prefetch and retrieve packages
+    def test_package_instances
+        providers = []
+        @type.instances.each do |resource|
+            # Just do one of each type
+            next if providers.include?(resource.provider.class)
+            providers << resource.provider.class
+
+            # We should have data on the resource
+            assert(resource.exists?, "Listed resource thinks it's absent")
+
+            # Now flush the resource and make sure it clears the property_hash
+            assert_nothing_raised("Could not flush package") do
+                resource.flush
+            end
+
+            assert_equal(:absent, resource.provider.get(:ensure), "Flushing did not empty property hash")
+
+            # And query anew
+            props = nil
+            assert_nothing_raised("Could not retrieve package again") do
+                props = resource.retrieve
+            end
+            provider_props = resource.provider.send(:instance_variable_get, "@property_hash")
+            props.each do |prop, value|
+                assert_equal(value, provider_props[prop.name], "Query did not return same result as the property_hash for %s" % prop.name)
+            end
+        end
+    end
+
+    # Make sure we can prefetch package information, rather than getting it one package at a time.
+    def test_prefetch
+        @type.providers_by_source.each do |provider|
+            # First get a list of packages
+            list = provider.instances
+
+            packages = {}
+            list.each do |package|
+                packages[package.name] = @type.create(:name => package.name, :ensure => :installed)
+                break if packages.length > 4
+            end
+
+            # Now prefetch using that list of packages
+            assert_nothing_raised("Could not prefetch with %s" % provider.name) do
+                provider.prefetch(packages)
+            end
+
+            # And make sure each package is marked as existing, without calling query
+            packages.each do |name, package|
+                assert(package.exists?, "Package of type %s not marked present" % provider.name)
+                package.provider.expects(:query).never
+            end
+        end
+    end
 end
 
-# $Id: package.rb 2170 2007-02-07 17:21:52Z luke $
+# $Id: package.rb 2555 2007-06-08 17:20:00Z luke $

data/test/ral/types/parameter.rb

@@ -20,7 +20,7 @@ class TestParameter < Test::Unit::TestCase
 
     def newinst(param)
         assert_nothing_raised {
-            return param.new(:parent => "yay")
+            return param.new(:resource => "yay")
         }
     end
 
@@ -169,4 +169,4 @@ class TestParameter < Test::Unit::TestCase
     end
 end
 
-# $Id: parameter.rb 2413 2007-04-25 20:04:59Z luke $
+# $Id: parameter.rb 2500 2007-05-09 22:05:32Z luke $

data/test/ral/types/property.rb

@@ -7,14 +7,18 @@ require 'puppettest'
 class TestProperty < Test::Unit::TestCase
 	include PuppetTest
 
-    def newinst(property, parent = nil)
+    def newinst(property, resource = nil)
         inst = nil
-        unless parent
-            parent = "fakeparent"
-            parent.meta_def(:pathbuilder) do [self.to_s] end
+        unless resource
+            resource = "fakeresource"
+            resource.meta_def(:pathbuilder) do [self.to_s] end
+            resource.meta_def(:provider) do nil end
+            resource.meta_def(:fakeproperty) do '' end
         end
         assert_nothing_raised {
-            return property.new(:parent => parent)
+            newinst = property.new(:resource => resource)
+            def newinst.retrieve(); return @fakeprovidervalue; end;
+            return newinst
         }
     end
     
@@ -104,13 +108,13 @@ class TestProperty < Test::Unit::TestCase
         # These are bogus because they don't define events. :/
         assert_nothing_raised {
             property.newvalue(:one) do
-                @is = 1
+                @fakeprovidervalue = 1
             end
         }
 
         assert_nothing_raised {
             property.newvalue("two") do
-                @is = 2
+                @fakeprovidervalue = 2
             end
         }
 
@@ -127,7 +131,7 @@ class TestProperty < Test::Unit::TestCase
         assert_equal(:one, inst.should)
         ret = nil
         assert_nothing_raised { inst.set_one }
-        assert_equal(1, inst.is)
+        assert_equal(1, inst.retrieve)
 
         assert_nothing_raised {
             inst.should = :two
@@ -135,7 +139,7 @@ class TestProperty < Test::Unit::TestCase
 
         assert_equal(:two, inst.should)
         assert_nothing_raised { inst.set_two }
-        assert_equal(2, inst.is)
+        assert_equal(2, inst.retrieve)
     end
 
     def test_newpropertyvaluewithregexes
@@ -143,7 +147,6 @@ class TestProperty < Test::Unit::TestCase
 
         assert_nothing_raised {
             property.newvalue(/^\w+$/) do
-                @is = self.should.upcase
                 return :regex_matched
             end
         }
@@ -160,7 +163,7 @@ class TestProperty < Test::Unit::TestCase
             inst.sync
         }
 
-        assert_equal("yayness".upcase, inst.is)
+        assert_equal("yayness".upcase, inst.retrieve)
     end
 
     def test_newvalue_event_option
@@ -168,10 +171,8 @@ class TestProperty < Test::Unit::TestCase
 
         assert_nothing_raised do
             property.newvalue(:myvalue, :event => :fake_valued) do
-                @is = :valued
             end
             property.newvalue(:other, :event => "fake_other") do
-                @is = :valued
             end
         end
         inst = newinst(property)
@@ -221,7 +222,7 @@ class TestProperty < Test::Unit::TestCase
         inst = newinst(property, klassinst)
 
         # Now make sure we can set the values, they get validated as normal,
-        # and they set the values on the parent rathe than trying to call
+        # and they set the values on the resource rather than trying to call
         # a method
         {:value => :matched_value, "27" => :matched_number}.each do |value, event|
             assert_nothing_raised do
@@ -254,7 +255,7 @@ class TestProperty < Test::Unit::TestCase
  
         inst = nil
         assert_nothing_raised do
-            inst = propertyklass.new(:parent => obj)
+            inst = propertyklass.new(:resource => obj)
         end
 
         assert_nothing_raised do
@@ -263,15 +264,21 @@ class TestProperty < Test::Unit::TestCase
     end
 
     def test_failure
-        s = Struct.new(:line, :file, :path, :pathbuilder)
-        p = s.new(1, "yay", "rah", "struct")
-        myproperty = Class.new(Puppet::Property)
+        s = Struct.new(:line, :file, :path, :pathbuilder, :name)
+        p = s.new(1, "yay", "rah", "struct", "name")
+
+        myprovider = Class.new(Puppet::Provider)
+  
+        def p.provider; nil; end;
+        myproperty = Class.new(Puppet::Property) do 
+            @name = 'name'
+        end
         myproperty.initvars
 
         myproperty.newvalue :mkfailure do
             raise "It's all broken"
         end
-        property = myproperty.new(:parent => p)
+        property = myproperty.new(:resource => p)
 
         assert_raise(Puppet::Error) do
             property.set(:mkfailure)
@@ -340,4 +347,4 @@ class TestProperty < Test::Unit::TestCase
     end
 end
 
-# $Id: property.rb 2170 2007-02-07 17:21:52Z luke $
+# $Id: property.rb 2500 2007-05-09 22:05:32Z luke $

data/test/ral/types/resources.rb

@@ -13,7 +13,7 @@ class TestResources < Test::Unit::TestCase
 	def add_purge_lister
         # Now define the list method
         class << @purgetype
-            def list
+            def instances
                 $purgemembers.values
             end
         end
@@ -85,21 +85,9 @@ class TestResources < Test::Unit::TestCase
             purger = @type.create :name => "purgetest", :noop => true, :loglevel => :warning
         end
         assert(purger, "did not get purger manager")
-        
-        # Make sure we throw an error, because the purger type does
-        # not support listing.
-        
-        # It should work when we set it to false
-        assert_nothing_raised do
-            purger[:purge] = false
-        end
-        # but not true
-        assert_raise(ArgumentError) do
-            purger[:purge] = true
-        end
         add_purge_lister()
         
-        assert_equal($purgemembers.values.sort, @purgetype.list.sort)
+        assert_equal($purgemembers.values.sort, @purgetype.instances.sort)
         
         # and it should now succeed
         assert_nothing_raised do
@@ -212,10 +200,10 @@ class TestResources < Test::Unit::TestCase
         assert(! list.empty?, "did not get any users")
         
         bad = list.find_all { |u|
-                %w{root bin nobody}.include?(u[:name]) or (u.retrieve and u.is(:uid) < 500)
+                %w{root bin nobody}.include?(u[:name]) or (cv = u.retrieve and cv[u.property(:uid)] < 500)
             }
         assert(bad.empty?, "incorrectly passed users %s" % bad.collect { |u| u[:name]}.join(", "))
     end
 end
 
-# $Id: resources.rb 2286 2007-03-17 23:16:37Z luke $
+# $Id: resources.rb 2551 2007-06-04 20:37:14Z luke $

data/test/ral/types/schedule.rb

@@ -94,7 +94,7 @@ class TestSchedule < Test::Unit::TestCase
             #end
         end
 
-        Puppet.err @@times.inspect
+         Puppet.err @@times.inspect
 
         @@times.each { |time|
             @now = time
@@ -354,4 +354,4 @@ class TestSchedule < Test::Unit::TestCase
     end
 end
 
-# $Id: schedule.rb 2238 2007-02-28 00:14:27Z luke $
+# $Id: schedule.rb 2487 2007-05-09 01:51:20Z ballman $

data/test/ral/types/service.rb

@@ -23,9 +23,8 @@ class TestServiceType < Test::Unit::TestCase
 
     def test_refresh_normally
         service = Puppet::Type.type(:service).create :name => "testing",
-            :ensure => :running, :provider => :base
+            :ensure => :running, :provider => :base, :status => "cat /dev/null"
 
-        service.is = [:ensure, :running]
         service.provider.expects(:restart)
 
         assert_nothing_raised do
@@ -34,4 +33,4 @@ class TestServiceType < Test::Unit::TestCase
     end
 end
 
-# $Id: service.rb 2236 2007-02-27 23:57:55Z luke $
+# $Id: service.rb 2487 2007-05-09 01:51:20Z ballman $

data/test/ral/types/sshkey.rb

@@ -59,9 +59,9 @@ class TestSSHKey < Test::Unit::TestCase
         return key
     end
 
-    def test_list
+    def test_instances
         assert_nothing_raised {
-            Puppet.type(:sshkey).defaultprovider.list
+            Puppet.type(:sshkey).instances
         }
 
         count = 0
@@ -189,4 +189,4 @@ class TestSSHKey < Test::Unit::TestCase
     end
 end
 
-# $Id: sshkey.rb 2170 2007-02-07 17:21:52Z luke $
+# $Id: sshkey.rb 2551 2007-06-04 20:37:14Z luke $

data/test/ral/types/tidy.rb

@@ -151,14 +151,10 @@ class TestTidy < Test::Unit::TestCase
         age = tidy.property(:age)
 
         # Set it to something that should be fine
-        age.is = Time.now.to_i - 5
-
-        assert(age.insync?, "Tried to tidy a low age")
+        assert(age.insync?(Time.now.to_i - 5), "Tried to tidy a low age")
 
         # Now to something that should fail
-        age.is = Time.now.to_i - 120
-
-        assert(! age.insync?, "Incorrectly skipped tidy")
+        assert(! age.insync?(Time.now.to_i - 120), "Incorrectly skipped tidy")
     end
 
     def test_sizetest
@@ -167,14 +163,10 @@ class TestTidy < Test::Unit::TestCase
         size = tidy.property(:size)
 
         # Set it to something that should be fine
-        size.is = 50
-
-        assert(size.insync?, "Tried to tidy a low size")
+        assert(size.insync?(50), "Tried to tidy a low size")
 
         # Now to something that should fail
-        size.is = 2048
-
-        assert(! size.insync?, "Incorrectly skipped tidy")
+        assert(! size.insync?(2048), "Incorrectly skipped tidy")
     end
 
     # Make sure we can remove different types of files
@@ -197,7 +189,6 @@ class TestTidy < Test::Unit::TestCase
 
         # And a directory
         Dir.mkdir(path)
-        tidy.is = [:ensure, [Time.now - 1024, 1]]
         tidy[:rmdirs] = true
         assert_events([:file_tidied], tidy)
         assert(! FileTest.exists?(path), "File was not removed")
@@ -218,7 +209,7 @@ class TestTidy < Test::Unit::TestCase
         File.open(path, "w") { |f| 10.times { f.puts "yayness " } }
         tidy = Puppet::Type.type(:tidy).create :path => path, :age => "5s"
         
-        tidy.property(:age).is = "0s"
+
         assert_apply(tidy)
         assert(! FileTest.exists?(path), "file did not get tidied")
     end
@@ -237,4 +228,4 @@ class TestTidy < Test::Unit::TestCase
     end
 end
 
-# $Id: tidy.rb 2170 2007-02-07 17:21:52Z luke $
+# $Id: tidy.rb 2487 2007-05-09 01:51:20Z ballman $

data/test/ral/types/user.rb

@@ -13,7 +13,7 @@ class TestUser < Test::Unit::TestCase
         apimethods
         def create
             @ensure = :present
-            @model.eachproperty do |property|
+            @resource.send(:properties).each do |property|
                 next if property.name == :ensure
                 property.sync
             end
@@ -21,7 +21,7 @@ class TestUser < Test::Unit::TestCase
 
         def delete
             @ensure = :absent
-            @model.eachproperty do |property|
+            @resource.send(:properties).each do |property|
                 send(property.name.to_s + "=", :absent)
             end
         end
@@ -305,11 +305,11 @@ class TestUser < Test::Unit::TestCase
         assert(user.provider.groups.is_a?(String),
             "Incorrectly passed an array to groups")
 
-        user.retrieve
+        currentvalue = user.retrieve
 
-        assert(user.property(:groups).is, "Did not retrieve group list")
+        assert(currentvalue[user.property(:groups)], "Did not retrieve group list")
 
-        list = user.property(:groups).is
+        list = currentvalue[user.property(:groups)]
         assert_equal(extra.sort, list.sort, "Group list is not equal")
 
         # Now set to our main list of groups
@@ -319,45 +319,45 @@ class TestUser < Test::Unit::TestCase
 
         assert_equal((main + extra).sort, user.property(:groups).should.split(",").sort)
 
+        currentvalue = nil
         assert_nothing_raised {
-            user.retrieve
+            currentvalue = user.retrieve
         }
 
-        assert(!user.insync?, "User is incorrectly in sync")
+        assert(!user.insync?(currentvalue), "User is incorrectly in sync")
 
         assert_apply(user)
 
         assert_nothing_raised {
-            user.retrieve
+            currentvalue = user.retrieve
         }
 
         # We're not managing inclusively, so it should keep the old group
         # memberships and add the new ones
-        list = user.property(:groups).is
+        list = currentvalue[user.property(:groups)]
         assert_equal((main + extra).sort, list.sort, "Group list is not equal")
 
         assert_nothing_raised {
             user[:membership] = :inclusive
         }
         assert_nothing_raised {
-            user.retrieve
+            currentvalue = user.retrieve
         }
 
-        assert(!user.insync?, "User is incorrectly in sync")
+        assert(!user.insync?(currentvalue), "User is incorrectly in sync")
 
         assert_events([:user_changed], user)
         assert_nothing_raised {
-            user.retrieve
+            currentvalue = user.retrieve
         }
 
-        list = user.property(:groups).is
+        list = currentvalue[user.property(:groups)]
         assert_equal(main.sort, list.sort, "Group list is not equal")
 
         # Set the values a bit differently.
         user.property(:groups).should = list.sort { |a,b| b <=> a }
-        user.property(:groups).is = list.sort
 
-        assert(user.property(:groups).insync?, "Groups property did not sort groups")
+        assert(user.property(:groups).insync?(list.sort), "Groups property did not sort groups")
 
         user.delete(:groups)
     end
@@ -460,7 +460,7 @@ class TestUser < Test::Unit::TestCase
             user.evaluate
         end
 
-        assert(user.send(:property, :groups).insync?,
+        assert(user.send(:property, :groups).insync?(nil),
             "Groups state considered out of sync with no :should value")
     end
 
@@ -490,4 +490,4 @@ class TestUser < Test::Unit::TestCase
     end
 end
 
-# $Id: user.rb 2328 2007-03-19 21:29:08Z luke $
+# $Id: user.rb 2501 2007-05-09 23:08:42Z luke $