puppet 0.24.9 → 0.25.0

data/test/ral/providers/cron/crontab.rb

@@ -7,8 +7,8 @@ require 'mocha'
 require 'puppettest/fileparsing'
 
 class TestCronParsedProvider < Test::Unit::TestCase
-	include PuppetTest
-	include PuppetTest::FileParsing
+    include PuppetTest
+    include PuppetTest::FileParsing
 
 
     FIELDS = {
@@ -21,7 +21,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
 
     # These are potentially multi-line records; there's no one-to-one map, but they model
     # a full cron job.  These tests assume individual record types will always be correctly
-    # parsed, so all they 
+    # parsed, so all they
     def sample_crons
         unless defined? @sample_crons
             @sample_crons = YAML.load(File.read(File.join(@crondir, "crontab_collections.yaml")))
@@ -221,7 +221,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
             assert_nothing_raised("could not load %s" % file) do
                 str, args = YAML.load(File.read(file))
             end
-            
+
             # Stupid old yaml
             args.each do |hash|
                 hash.each do |param, value|
@@ -298,7 +298,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
         assert_equal("# Puppet Name: #{name}\n30 * * * * date > /dev/null", str,
             "Cron did not generate correctly")
     end
-    
+
     # Test that comments are correctly retained
     def test_retain_comments
         str = "# this is a comment\n#and another comment\n"
@@ -380,7 +380,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
         setme
 
         target = @provider.target_object(@me)
-        
+
         [
             "* * * * * /some/command",
             "0,30 * * * * /some/command",
@@ -435,13 +435,13 @@ class TestCronParsedProvider < Test::Unit::TestCase
 
         # Now make some crons that should match
         matchers = [
-            @type.create(
+            @type.new(
                 :name => "yaycron",
                 :minute => [0, 30],
                 :command => "date",
                 :user => @me
             ),
-            @type.create(
+            @type.new(
                 :name => "youtest",
                 :command => "yaytest",
                 :user => you
@@ -449,14 +449,14 @@ class TestCronParsedProvider < Test::Unit::TestCase
         ]
 
         nonmatchers = [
-            @type.create(
+            @type.new(
                 :name => "footest",
                 :minute => [0, 30],
                 :hour => 1,
                 :command => "fooness",
                 :user => @me # wrong target
             ),
-            @type.create(
+            @type.new(
                 :name => "funtest2",
                 :command => "funtest",
                 :user => you # wrong target for this cron
@@ -464,7 +464,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
         ]
 
         # Create another cron so we prefetch two of them
-        @type.create(:name => "testing", :minute => 30, :command => "whatever", :user => "you")
+        @type.new(:name => "testing", :minute => 30, :command => "whatever", :user => "you")
 
         assert_nothing_raised("Could not prefetch cron") do
             @provider.prefetch([matchers, nonmatchers].flatten.inject({}) { |crons, cron| crons[cron.name] = cron; crons })
@@ -522,7 +522,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
         setme
 
         target = @provider.target_object(@me)
-        
+
         [
             "@daily /some/command",
             "@daily /some/command more"
@@ -555,7 +555,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
     end
 
     def test_prefetch
-        cron = @type.create :command => "/bin/echo yay", :name => "test", :hour => 4
+        cron = @type.new :command => "/bin/echo yay", :name => "test", :hour => 4
 
         assert_nothing_raised("Could not prefetch cron") do
             cron.provider.class.prefetch("test" => cron)
@@ -570,7 +570,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
         target = @provider.target_object(@me)
 
         # First with no env settings
-        resource = @type.create :command => "/bin/echo yay", :name => "test", :hour => 4
+        resource = @type.new :command => "/bin/echo yay", :name => "test", :hour => 4
         cron = resource.provider
 
         cron.ensure = :present

data/test/ral/providers/group.rb

@@ -6,7 +6,7 @@ require 'puppettest'
 require 'etc'
 
 class TestGroupProvider < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
     def setup
         super
         @@tmpgroups = []
@@ -21,7 +21,6 @@ class TestGroupProvider < Test::Unit::TestCase
 
     def teardown
         super
-        Puppet.type(:group).clear
         @@tmpgroups.each { |group|
             unless missing?(group)
                 remove(group)
@@ -48,7 +47,7 @@ class TestGroupProvider < Test::Unit::TestCase
     end
 
     case Facter["operatingsystem"].value
-    when "Darwin":
+    when "Darwin"
         def missing?(group)
             output = %x{nidump -r /groups/#{group} / 2>/dev/null}.chomp
 
@@ -196,7 +195,7 @@ class TestGroupProvider < Test::Unit::TestCase
             }
             assert(!missing?(name), "Group %s is missing" % name)
 
-            tests = Puppet.type(:group).validproperties
+            tests = Puppet::Type.type(:group).validproperties
 
             tests.each { |test|
                 if self.respond_to?("attrtest_%s" % test)
@@ -238,10 +237,10 @@ class TestGroupProvider < Test::Unit::TestCase
     else
         $stderr.puts "Not running as root; skipping group creation tests."
     end
-    
+
     def test_autogen
         provider = nil
-        group = Puppet::Type.type(:group).create(:name => nonrootgroup.name)
+        group = Puppet::Type.type(:group).new(:name => nonrootgroup.name)
         provider = group.provider
         assert(provider, "did not get provider")
 

data/test/ral/providers/host/parsed.rb

@@ -8,12 +8,12 @@ require 'puppettest/fileparsing'
 require 'test/unit'
 
 class TestParsedHostProvider < Test::Unit::TestCase
-	include PuppetTest
-	include PuppetTest::FileParsing
+    include PuppetTest
+    include PuppetTest::FileParsing
 
     def setup
         super
-        @provider = Puppet.type(:host).provider(:parsed)
+        @provider = Puppet::Type.type(:host).provider(:parsed)
 
         @oldfiletype = @provider.filetype
     end

data/test/ral/providers/mailalias/aliases.rb

@@ -6,12 +6,12 @@ require 'puppettest'
 require 'puppettest/fileparsing'
 
 class TestMailaliasAliasesProvider < Test::Unit::TestCase
-	include PuppetTest
-	include PuppetTest::FileParsing
+    include PuppetTest
+    include PuppetTest::FileParsing
 
     def setup
         super
-        @provider = Puppet.type(:mailalias).provider(:aliases)
+        @provider = Puppet::Type.type(:mailalias).provider(:aliases)
 
         @oldfiletype = @provider.filetype
 
@@ -24,7 +24,7 @@ class TestMailaliasAliasesProvider < Test::Unit::TestCase
         @provider.clear
         super
     end
-    
+
     def mkalias(name = "me")
         if defined? @pcount
             @pcount += 1

data/test/ral/providers/package.rb

@@ -6,7 +6,7 @@ require 'puppettest'
 require 'etc'
 
 class TestPackageProvider < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     def setup
         super
@@ -127,7 +127,7 @@ class TestPackageProvider < Test::Unit::TestCase
                 return
             end
         end
-        
+
         if cleancmd = hash[:cleanup]
             hash.delete(:cleanup)
         end
@@ -240,7 +240,7 @@ class TestPackageProvider < Test::Unit::TestCase
 
     def modpkg(pkg)
         case pkg[:provider]
-        when :sun:
+        when :sun
             pkg[:adminfile] = "/usr/local/pkg/admin_file"
         end
     end

data/test/ral/providers/package/aptitude.rb

@@ -8,64 +8,64 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
     confine "Aptitude package provider missing" =>
         Puppet::Type.type(:package).provider(:aptitude).suitable?
 
-	def setup
+    def setup
         super
-		@type = Puppet::Type.type(:package)
-	end
-	
-	def test_install
-		pkg = @type.create :name => 'faff',
-		                   :provider => :aptitude,
-		                   :ensure => :present,
-		                   :source => "/tmp/faff.deb"
+        @type = Puppet::Type.type(:package)
+    end
 
- 		pkg.provider.expects(
- 		                 :dpkgquery
- 					  ).with(
- 							  '-W',
- 							  '--showformat',
- 							  '${Status} ${Package} ${Version}\n',
- 							  'faff'
- 					  ).returns(
- 					        "deinstall ok config-files faff 1.2.3-1\n"
- 					  ).times(1)
+    def test_install
+        pkg = @type.new :name => 'faff',
+                           :provider => :aptitude,
+                           :ensure => :present,
+                           :source => "/tmp/faff.deb"
 
-		pkg.provider.expects(
-		                 :aptitude
-		           ).with(
-		                 '-y',
-		                 '-o',
-		                 'DPkg::Options::=--force-confold',
-		                 :install,
-		                 'faff'
-					  ).returns(0)
-		
-		pkg.evaluate.each { |state| 
-                    state.forward 
+        pkg.provider.expects(
+                         :dpkgquery
+                      ).with(
+                              '-W',
+                              '--showformat',
+                              '${Status} ${Package} ${Version}\n',
+                              'faff'
+                      ).returns(
+                            "deinstall ok config-files faff 1.2.3-1\n"
+                      ).times(1)
+
+        pkg.provider.expects(
+                         :aptitude
+                   ).with(
+                         '-y',
+                         '-o',
+                         'DPkg::Options::=--force-confold',
+                         :install,
+                         'faff'
+                      ).returns(0)
+
+        pkg.evaluate.each { |state|
+                    state.forward
           }
-	end
-	
-	def test_purge
-		pkg = @type.create :name => 'faff', :provider => :aptitude, :ensure => :purged
+    end
+
+    def test_purge
+        pkg = @type.new :name => 'faff', :provider => :aptitude, :ensure => :purged
+
+        pkg.provider.expects(
+                         :dpkgquery
+                      ).with(
+                            '-W',
+                            '--showformat',
+                            '${Status} ${Package} ${Version}\n',
+                            'faff'
+                      ).returns(
+                            "install ok installed faff 1.2.3-1\n"
+                      ).times(1)
+        pkg.provider.expects(
+                         :aptitude
+                      ).with(
+                            '-y',
+                            'purge',
+                            'faff'
+                      ).returns(0)
 
-		pkg.provider.expects(
-		                 :dpkgquery
-					  ).with(
-					        '-W',
-					        '--showformat',
-					        '${Status} ${Package} ${Version}\n',
-					        'faff'
-					  ).returns(
-					        "install ok installed faff 1.2.3-1\n"
-					  ).times(1)
-		pkg.provider.expects(
-		                 :aptitude
-					  ).with(
-					        '-y',
-					        'purge',
-					        'faff'
-					  ).returns(0)
-		
-		pkg.evaluate.each { |state| state.forward }
-	end
+        pkg.evaluate.each { |state| state.forward }
+    end
 end

data/test/ral/providers/package/aptrpm.rb

@@ -12,9 +12,9 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
         super
         @type = Puppet::Type.type(:package)
     end
-    
+
     def test_install
-        pkg = @type.create :name => 'faff',
+        pkg = @type.new :name => 'faff',
                            :provider => :aptrpm,
                            :ensure => :present,
                            :source => "/tmp/faff.rpm"
@@ -38,12 +38,12 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
                          "install",
                          'faff'
                     ).returns(0)
-        
+
         pkg.evaluate.each { |state| state.forward }
     end
-    
+
     def test_uninstall
-        pkg = @type.create :name => 'faff', :provider => :aptrpm, :ensure => :absent
+        pkg = @type.new :name => 'faff', :provider => :aptrpm, :ensure => :absent
 
         pkg.provider.expects(
                          :rpm
@@ -65,13 +65,13 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
                         'remove',
                         'faff'
                     ).returns(0)
-        
+
         pkg.evaluate.each { |state| state.forward }
     end
 
     # LAK: I don't know where this test will ever return true..
     def disabled_test_latest
-        pkg = @type.create :name => 'ssh', :provider => :aptrpm
+        pkg = @type.new :name => 'ssh', :provider => :aptrpm
 
         assert(pkg, "did not create pkg")
         status = pkg.provider.query

data/test/ral/providers/parsedfile.rb

@@ -10,8 +10,8 @@ require 'puppet/provider/parsedfile'
 require 'facter'
 
 class TestParsedFile < Test::Unit::TestCase
-	include PuppetTest
-	include PuppetTest::FileParsing
+    include PuppetTest
+    include PuppetTest::FileParsing
 
     Puppet::Type.newtype(:testparsedfiletype) do
         ensurable
@@ -47,7 +47,7 @@ class TestParsedFile < Test::Unit::TestCase
         options[:two] ||= "c"
         options[:name] ||= name
 
-        resource = @type.create(options)
+        resource = @type.new(options)
     end
 
     def mkprovider(name = :parsed)
@@ -587,14 +587,14 @@ class TestParsedFile < Test::Unit::TestCase
             bills_values = bill.retrieve
         end
 
-        assert(bills_values[bill.property(:one)], 
+        assert(bills_values[bill.property(:one)],
                "Bill does not have a value for 'one'")
-        assert(bills_values[bill.property(:one)], 
+        assert(bills_values[bill.property(:one)],
                "Bill does not have a value for 'one' on second try")
         assert_nothing_raised do
             bill.retrieve
         end
-        assert(bills_values[bill.property(:one)], 
+        assert(bills_values[bill.property(:one)],
                "bill's value for 'one' disappeared")
     end
 
@@ -608,13 +608,9 @@ class TestParsedFile < Test::Unit::TestCase
         prov.prefetch
 
         # Now make a resource
-        bill = nil
-        assert_nothing_raised do
-            bill = @type.create :name => "bill"
-        end
+        bill = @type.new :name => "bill"
 
-        assert_equal("a", bill.provider.one,
-            "Record was not found in memory")
+        assert_equal("a", bill.provider.one, "Record was not found in memory")
     end
 
     # Make sure invalid fields always show up as insync
@@ -627,7 +623,7 @@ class TestParsedFile < Test::Unit::TestCase
 
         bill = nil
         assert_nothing_raised do
-            bill = @type.create :name => "bill",
+            bill = @type.new :name => "bill",
                 :one => "a", :two => "c"
         end
 
@@ -683,7 +679,7 @@ class TestParsedFile < Test::Unit::TestCase
         otarget.write("oname b d\n")
 
         # Now make a resource that targets elsewhat.
-        res = @type.create(:name => "test", :one => "a", :two => "c",
+        res = @type.new(:name => "test", :one => "a", :two => "c",
             :target => opath)
 
         assert(res.property(:target), "Target is a parameter, not a property")