puppet 0.24.9 → 0.25.0

data/test/ral/type/group.rb

@@ -6,7 +6,7 @@ require 'puppettest'
 require 'etc'
 
 class TestGroup < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     p = Puppet::Type.type(:group).provide :fake, :parent => PuppetTest::FakeProvider do
         @name = :fake
@@ -39,7 +39,6 @@ class TestGroup < Test::Unit::TestCase
     end
 
     def teardown
-        Puppet.type(:group).clear
         Puppet::Type.type(:group).defaultprovider = nil
         super
     end
@@ -48,7 +47,7 @@ class TestGroup < Test::Unit::TestCase
         group = nil
         hash[:name] = name
         assert_nothing_raised {
-            group = Puppet.type(:group).create(hash)
+            group = Puppet::Type.type(:group).new(hash)
         }
 
         return group
@@ -116,7 +115,7 @@ class TestGroup < Test::Unit::TestCase
             gobj = nil
             comp = nil
             assert_nothing_raised {
-                gobj = Puppet.type(:group).create(
+                gobj = Puppet::Type.type(:group).new(
                     :name => group,
                     :check => [:gid]
                 )
@@ -130,7 +129,7 @@ class TestGroup < Test::Unit::TestCase
                 current_values = gobj.retrieve
             }
 
-            assert(current_values[gobj.property(:gid)], 
+            assert(current_values[gobj.property(:gid)],
                    "Failed to retrieve gid")
         }
     end
@@ -140,7 +139,7 @@ class TestGroup < Test::Unit::TestCase
         name = "pptestgr"
 
         assert_nothing_raised {
-            gobj = Puppet.type(:group).create(
+            gobj = Puppet::Type.type(:group).new(
                 :name => name,
                 :gid => 123
             )
@@ -152,7 +151,7 @@ class TestGroup < Test::Unit::TestCase
         assert(gobj.provider.exists?,
                 "Did not create group")
 
-        tests = Puppet.type(:group).validproperties
+        tests = Puppet::Type.type(:group).validproperties
 
         gobj.retrieve
         tests.each { |test|

data/test/ral/type/host.rb

@@ -7,7 +7,7 @@ require 'test/unit'
 require 'facter'
 
 class TestHost < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     def setup
         super
@@ -15,7 +15,7 @@ class TestHost < Test::Unit::TestCase
 
         @provider = @hosttype.defaultprovider
 
-        # Make sure they aren't using something funky like netinfo
+        # Make sure they are using the parsed provider
         unless @provider.name == :parsed
             @hosttype.defaultprovider = @hosttype.provider(:parsed)
         end
@@ -43,7 +43,7 @@ class TestHost < Test::Unit::TestCase
 
         host = nil
         assert_nothing_raised {
-            host = Puppet.type(:host).create(
+            host = Puppet::Type.type(:host).new(
                 :name => "fakehost%s" % @hcount,
                 :ip => "192.168.27.%s" % @hcount,
                 :alias => "alias%s" % @hcount,
@@ -55,29 +55,20 @@ class TestHost < Test::Unit::TestCase
     end
 
     def test_list
+        list = nil
         assert_nothing_raised do
-            @hosttype.defaultprovider.prefetch
+            list = @hosttype.defaultprovider.instances
         end
 
-        count = 0
-        @hosttype.each do |h|
-            count += 1
-        end
-
-        assert_equal(0, count, "Found hosts in empty file somehow")
+        assert_equal(0, list.length, "Found hosts in empty file somehow")
     end
 
-    # Darwin will actually write to netinfo here.
-    if Facter.value(:operatingsystem) != "Darwin" or Process.uid == 0
+
     def test_simplehost
         host = nil
-        # We want to actually use the netinfo provider on darwin
-        if Facter.value(:operatingsystem) == "Darwin"
-            Puppet::Type.type(:host).defaultprovider = nil
-        end
 
         assert_nothing_raised {
-            host = Puppet.type(:host).create(
+            host = Puppet::Type.type(:host).new(
                 :name => "culain",
                 :ip => "192.168.0.3"
             )
@@ -101,14 +92,7 @@ class TestHost < Test::Unit::TestCase
     end
 
     def test_moddinghost
-        # We want to actually use the netinfo provider on darwin
-        if Facter.value(:operatingsystem) == "Darwin"
-            Puppet::Type.type(:host).defaultprovider = nil
-        end
         host = mkhost()
-        if Facter.value(:operatingsystem) == "Darwin"
-            assert_equal(:netinfo, host[:provider], "Got incorrect provider")
-        end
         cleanup do
             host[:ensure] = :absent
             assert_apply(host)
@@ -116,7 +100,7 @@ class TestHost < Test::Unit::TestCase
 
         assert_events([:host_created], host)
 
-        current_values = nil 
+        current_values = nil
         assert_nothing_raised {
             current_values = host.retrieve
         }
@@ -132,13 +116,13 @@ class TestHost < Test::Unit::TestCase
             current_values = host.retrieve
         }
 
-        assert_equal(%w{madstop kirby yayness}, 
+        assert_equal(%w{madstop kirby yayness},
                      current_values[host.property(:alias)])
-        
+
         host[:ensure] = :absent
         assert_events([:host_removed], host)
     end
- 
+
     def test_invalid_ipaddress
         host = mkhost()
 
@@ -199,7 +183,6 @@ class TestHost < Test::Unit::TestCase
         }
     end
 
-    end  
     def test_aliasisproperty
         assert_equal(:property, @hosttype.attrtype(:alias))
     end
@@ -213,12 +196,13 @@ class TestHost < Test::Unit::TestCase
 
     def test_puppetalias
         host = mkhost()
+        catalog = mk_catalog(host)
 
         assert_nothing_raised {
             host[:alias] = "testing"
         }
 
-        same = host.class["testing"]
+        same = catalog.resource(:host, "testing")
         assert(same, "Could not retrieve by alias")
     end
 end

data/test/ral/type/mailalias.rb

@@ -6,7 +6,7 @@ require 'puppettest'
 require 'mocha'
 
 class TestMailAlias < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     def setup
         super
@@ -14,7 +14,7 @@ class TestMailAlias < Test::Unit::TestCase
 
         @provider = @type.defaultprovider
 
-        # Make sure they aren't using something funky like netinfo
+        # Make sure they are using the parsed provider
         unless @provider.name == :aliases
             @type.defaultprovider = @type.provider(:aliases)
         end
@@ -33,7 +33,7 @@ class TestMailAlias < Test::Unit::TestCase
 
     # This isn't much of a test, but then, it's not much of a type.
     def test_recipient_arrays
-        resource = @type.create(:name => "luke", :recipient => "yay", :target => tempfile)
+        resource = @type.new(:name => "luke", :recipient => "yay", :target => tempfile)
         values = nil
         assert_nothing_raised("Could not retrieve mailalias") do
             values = resource.retrieve.inject({}) { |hash, a| hash[a[0].name] = a[1]; hash }

data/test/ral/type/port.rb

@@ -7,15 +7,15 @@ require 'puppettest'
 #require 'facter'
 #
 #class TestPort < Test::Unit::TestCase
-#	include PuppetTest
+#   include PuppetTest
 #
 #    def setup
 #        super
-#        @porttype = Puppet.type(:port)
+#        @porttype = Puppet::Type.type(:port)
 #
 #        @provider = @porttype.defaultprovider
 #
-#        # Make sure they aren't using something funky like netinfo
+#        # Make sure they are using the parsed provider
 #        unless @provider.name == :parsed
 #            @porttype.defaultprovider = @porttype.provider(:parsed)
 #        end
@@ -40,7 +40,7 @@ require 'puppettest'
 #            @pcount = 1
 #        end
 #        assert_nothing_raised {
-#            port = Puppet.type(:port).create(
+#            port = Puppet::Type.type(:port).new(
 #                :name => "puppet%s" % @pcount,
 #                :number => "813%s" % @pcount,
 #                :protocols => "tcp",
@@ -54,7 +54,7 @@ require 'puppettest'
 #
 #    def test_list
 #        assert_nothing_raised {
-#            Puppet.type(:port).list
+#            Puppet::Type.type(:port).list
 #        }
 #
 #        count = 0

data/test/ral/type/resources.rb

@@ -8,9 +8,9 @@ require File.dirname(__FILE__) + '/../../lib/puppettest'
 require 'puppettest'
 
 class TestResources < Test::Unit::TestCase
-	include PuppetTest
-	
-	def add_purge_lister
+    include PuppetTest
+
+    def add_purge_lister
         # Now define the list method
         class << @purgetype
             def instances
@@ -18,7 +18,7 @@ class TestResources < Test::Unit::TestCase
             end
         end
     end
-    
+
     def mk_purger(managed = false)
         @purgenum ||= 0
         @purgenum += 1
@@ -29,8 +29,8 @@ class TestResources < Test::Unit::TestCase
         end
         obj
     end
-	
-	def mkpurgertype
+
+    def mkpurgertype
         # Create a purgeable type
         $purgemembers = {}
         @purgetype = Puppet::Type.newtype(:purgetest) do
@@ -53,44 +53,44 @@ class TestResources < Test::Unit::TestCase
             Puppet::Type.rmtype(:purgetest)
         end
     end
-	
-	def setup
-	    super
-	    @type = Puppet::Type.type(:resources)
+
+    def setup
+        super
+        @type = Puppet::Type.type(:resources)
     end
 
     def test_purge
         # Create a purgeable type
         mkpurgertype
-        
+
         purger = nil
         assert_nothing_raised do
-            purger = @type.create :name => "purgetest", :noop => true, :loglevel => :warning
+            purger = @type.new :name => "purgetest", :noop => true, :loglevel => :warning
         end
         assert(purger, "did not get purger manager")
         add_purge_lister()
-        
+
         assert_equal($purgemembers.values.sort, @purgetype.instances.sort)
-        
+
         # and it should now succeed
         assert_nothing_raised do
             purger[:purge] = true
         end
         assert(purger.purge?, "purge boolean was not enabled")
-        
+
         # Okay, now let's try doing some purging, yo
         managed = []
         unmanned = []
         3.times { managed << mk_purger(true) } # 3 managed
         3.times { unmanned << mk_purger(false) } # 3 unmanaged
-        
+
         managed.each do |m|
             assert(m.managed?, "managed resource was not considered managed")
         end
         unmanned.each do |u|
             assert(! u.managed?, "unmanaged resource was considered managed")
         end
-        
+
         # First make sure we get nothing back when purge is false
         genned = nil
         purger[:purge] = false
@@ -98,7 +98,7 @@ class TestResources < Test::Unit::TestCase
             genned = purger.generate
         end
         assert_equal([], genned, "Purged even when purge is false")
-        
+
         # Now make sure we can purge
         purger[:purge] = true
         assert_nothing_raised do
@@ -110,11 +110,11 @@ class TestResources < Test::Unit::TestCase
             assert(res.purging, "did not mark resource for purging")
         end
         assert(! genned.empty?, "generated resource list was empty")
-        
+
         # Now make sure the generate method only finds the unmanaged resources
         assert_equal(unmanned.collect { |r| r.title }.sort, genned.collect { |r| r.title },
             "Did not return correct purge list")
-        
+
         # Now make sure our metaparams carried over
         genned.each do |res|
             [:noop, :loglevel].each do |param|
@@ -122,33 +122,33 @@ class TestResources < Test::Unit::TestCase
             end
         end
     end
-    
+
     # Part of #408.
     def test_check
         # First check a non-user
-        res = Puppet::Type.type(:resources).create :name => :package
+        res = Puppet::Type.type(:resources).new :name => :package
         assert_nil(res[:unless_system_user], "got bad default for package")
-        
-        
+
+
         assert_nothing_raised {
             assert(res.check("A String"), "String failed check")
-            assert(res.check(Puppet::Type.type(:file).create(:path => tempfile())), "File failed check")
-            assert(res.check(Puppet::Type.type(:user).create(:name => "yayness")), "User failed check in package")
+            assert(res.check(Puppet::Type.type(:file).new(:path => tempfile())), "File failed check")
+            assert(res.check(Puppet::Type.type(:user).new(:name => "yayness")), "User failed check in package")
         }
-        
+
         # Now create a user manager
-        res = Puppet::Type.type(:resources).create :name => :user
-        
+        res = Puppet::Type.type(:resources).new :name => :user
+
         # Make sure the default is 500
         assert_equal(500, res[:unless_system_user], "got bad default")
-        
+
         # Now make sure root fails the test
         @user = Puppet::Type.type(:user)
         assert_nothing_raised {
             assert(! res.check(@user.create(:name => "root")), "root passed check")
             assert(! res.check(@user.create(:name => "nobody")), "nobody passed check")
         }
-        
+
         # Now find a user between 0 and the limit
         low = high = nil
         Etc.passwd { |entry|
@@ -163,7 +163,7 @@ class TestResources < Test::Unit::TestCase
                 end
             end
         }
-        
+
         if low
             assert(! res.check(@user.create(:name => low)), "low user %s passed check" % low)
         end
@@ -172,16 +172,16 @@ class TestResources < Test::Unit::TestCase
             assert(res.check(@user.create(:name => high)), "high user %s failed check" % high)
         end
     end
-    
+
     # The other half of #408.
     def test_check_is_called
-        res = Puppet::Type.type(:resources).create :name => :user, :purge => true
-        
+        res = Puppet::Type.type(:resources).new :name => :user, :purge => true
+
         list = nil
         assert_nothing_raised { list = res.generate }
-        
+
         assert(! list.empty?, "did not get any users")
-        
+
         bad = list.find_all { |u|
                 %w{root bin nobody}.include?(u[:name]) or (cv = u.retrieve and cv[u.property(:uid)] < 500)
             }

data/test/ral/type/service.rb

@@ -6,11 +6,11 @@ require 'puppettest'
 require 'mocha'
 
 class TestServiceType < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     # #199
     def test_no_refresh_when_starting
-        service = Puppet::Type.type(:service).create :name => "hopefully_this_isnt_in_the_process_table",
+        service = Puppet::Type.type(:service).new :name => "hopefully_this_isnt_in_the_process_table",
             :ensure => :running, :provider => :base
 
         assert_equal :running, service.instance_eval('@parameters[:ensure]').should
@@ -25,7 +25,7 @@ class TestServiceType < Test::Unit::TestCase
     end
 
     def test_refresh_normally
-        service = Puppet::Type.type(:service).create :name => "testing",
+        service = Puppet::Type.type(:service).new :name => "testing",
             :ensure => :running, :provider => :base, :status => "cat /dev/null"
 
         service.provider.expects(:restart)