puppet 0.24.9 → 0.25.0

data/test/ral/type/sshkey.rb

@@ -6,15 +6,15 @@ require 'puppettest'
 require 'facter'
 
 class TestSSHKey < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
     def setup
         super
         # god i'm lazy
-        @sshkeytype = Puppet.type(:sshkey)
+        @sshkeytype = Puppet::Type.type(:sshkey)
 
         @provider = @sshkeytype.defaultprovider
 
-        # Make sure they aren't using something funky like netinfo
+        # Make sure they are using the parsed provider
         unless @provider.name == :parsed
             @sshkeytype.defaultprovider = @sshkeytype.provider(:parsed)
         end
@@ -48,26 +48,27 @@ class TestSSHKey < Test::Unit::TestCase
 
         @catalog ||= mk_catalog
 
-        assert_nothing_raised {
-            key = @sshkeytype.create(
-                :name => "host%s.madstop.com" % @kcount,
-                :key => "%sAAAAB3NzaC1kc3MAAACBAMnhSiku76y3EGkNCDsUlvpO8tRgS9wL4Eh54WZfQ2lkxqfd2uT/RTT9igJYDtm/+UHuBRdNGpJYW1Nw2i2JUQgQEEuitx4QKALJrBotejGOAWxxVk6xsh9xA0OW8Q3ZfuX2DDitfeC8ZTCl4xodUMD8feLtP+zEf8hxaNamLlt/AAAAFQDYJyf3vMCWRLjTWnlxLtOyj/bFpwAAAIEAmRxxXb4jjbbui9GYlZAHK00689DZuX0EabHNTl2yGO5KKxGC6Esm7AtjBd+onfu4Rduxut3jdI8GyQCIW8WypwpJofCIyDbTUY4ql0AQUr3JpyVytpnMijlEyr41FfIb4tnDqnRWEsh2H7N7peW+8DWZHDFnYopYZJ9Yu4/jHRYAAACAERG50e6aRRb43biDr7Ab9NUCgM9bC0SQscI/xdlFjac0B/kSWJYTGVARWBDWug705hTnlitY9cLC5Ey/t/OYOjylTavTEfd/bh/8FkAYO+pWdW3hx6p97TBffK0b6nrc6OORT2uKySbbKOn0681nNQh4a6ueR3JRppNkRPnTk5c=" % @kcount,
-                :type => "ssh-dss",
-                :alias => ["192.168.0.%s" % @kcount],
-                :catalog => @catalog
-            )
-        }
+        key = @sshkeytype.new(
+            :name => "host%s.madstop.com" % @kcount,
+            :key => "%sAAAAB3NzaC1kc3MAAACBAMnhSiku76y3EGkNCDsUlvpO8tRgS9wL4Eh54WZfQ2lkxqfd2uT/RTT9igJYDtm/+UHuBRdNGpJYW1Nw2i2JUQgQEEuitx4QKALJrBotejGOAWxxVk6xsh9xA0OW8Q3ZfuX2DDitfeC8ZTCl4xodUMD8feLtP+zEf8hxaNamLlt/AAAAFQDYJyf3vMCWRLjTWnlxLtOyj/bFpwAAAIEAmRxxXb4jjbbui9GYlZAHK00689DZuX0EabHNTl2yGO5KKxGC6Esm7AtjBd+onfu4Rduxut3jdI8GyQCIW8WypwpJofCIyDbTUY4ql0AQUr3JpyVytpnMijlEyr41FfIb4tnDqnRWEsh2H7N7peW+8DWZHDFnYopYZJ9Yu4/jHRYAAACAERG50e6aRRb43biDr7Ab9NUCgM9bC0SQscI/xdlFjac0B/kSWJYTGVARWBDWug705hTnlitY9cLC5Ey/t/OYOjylTavTEfd/bh/8FkAYO+pWdW3hx6p97TBffK0b6nrc6OORT2uKySbbKOn0681nNQh4a6ueR3JRppNkRPnTk5c=" % @kcount,
+            :type => "ssh-dss",
+            :alias => ["192.168.0.%s" % @kcount],
+            :catalog => @catalog
+        )
+
+        @catalog.add_resource(key)
 
         return key
     end
 
     def test_instances
+        list = nil
         assert_nothing_raised {
-            Puppet.type(:sshkey).instances
+            list = Puppet::Type.type(:sshkey).instances
         }
 
         count = 0
-        @sshkeytype.each do |h|
+        list.each do |h|
             count += 1
         end
 
@@ -81,39 +82,36 @@ class TestSSHKey < Test::Unit::TestCase
         key[:provider] = :parsed
 
         assert_apply(key)
-        
+
         assert_events([], key, "created events on in-sync key")
-        
+
         assert(key.provider.exists?, "Key did not get created")
-        
+
         # Now create a new key object
         name = key.name
         key = nil
-        @sshkeytype.clear
-        
-        key = @sshkeytype.create :name => name, :target => file, :provider => :parsed
+
+        key = @sshkeytype.new :name => name, :target => file, :provider => :parsed
         key.retrieve
-        
+
         assert(key.provider.exists?, "key thinks it does not exist")
-        
+
     end
 
     def test_moddingkey
         key = mkkey()
 
-        assert_events([:sshkey_created], key)
+        @catalog.apply
 
         key.retrieve
 
         aliases = %w{madstop kirby yayness}
         key[:alias] = aliases
 
-        params = key.instance_variable_get("@parameters")
-        assert_events([:sshkey_changed], key)
+        @catalog.apply
 
         aliases.each do |name|
-            assert_equal(key, key.class[name],
-                "alias was not set")
+            assert_equal(key.object_id, @catalog.resource(:sshkey, name).object_id, "alias %s was not set" % name)
         end
     end
 
@@ -135,7 +133,9 @@ class TestSSHKey < Test::Unit::TestCase
             key[:alias] = "testing"
         }
 
-        same = key.class["testing"]
+        key.finish
+
+        same = @catalog.resource(:sshkey, "testing")
         assert(same, "Could not retrieve by alias")
     end
 
@@ -169,7 +169,10 @@ class TestSSHKey < Test::Unit::TestCase
         }
         assert_apply(*keys)
         keys.clear
-        Puppet.type(:sshkey).clear
+
+        @catalog.clear(true)
+        @catalog = nil
+
         newkey = mkkey()
         #newkey[:ensure] = :present
         names << newkey.name
@@ -177,17 +180,9 @@ class TestSSHKey < Test::Unit::TestCase
 
         # Verify we can retrieve that info
         assert_nothing_raised("Could not retrieve after second write") {
-            newkey.provider.class.prefetch
-            newkey.retrieve
+            newkey.provider.prefetch
         }
 
-        # And verify that we have data for everything
-        names.each { |name|
-            key = Puppet.type(:sshkey)[name] ||
-                Puppet.type(:sshkey).create(:name => name)
-            assert(key, "Could not retrieve key for %s" % name)
-            assert(key.provider.exists?, "key %s is missing" % name)
-        }
+        assert(newkey.provider.exists?, "Did not see key in file")
     end
 end
-

data/test/ral/type/user.rb

@@ -6,7 +6,7 @@ require 'puppettest'
 require 'etc'
 
 class TestUser < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     p = Puppet::Type.type(:user).provide :fake, :parent => PuppetTest::FakeProvider do
         @name = :fake
@@ -64,7 +64,7 @@ class TestUser < Test::Unit::TestCase
     def mkuser(name)
         user = nil
         assert_nothing_raised {
-            user = Puppet.type(:user).create(
+            user = Puppet::Type.type(:user).new(
                 :name => name,
                 :comment => "Puppet Testing User",
                 :gid => Puppet::Util::SUIDManager.gid,
@@ -314,7 +314,7 @@ class TestUser < Test::Unit::TestCase
 
     def test_groups_list_must_not_contain_commas
         assert_raise(Puppet::Error) do
-            Puppet::Type.type(:user).create :name => "luke", :groups => "root,adm"
+            Puppet::Type.type(:user).new :name => "luke", :groups => "root,adm"
         end
     end
 
@@ -326,26 +326,26 @@ class TestUser < Test::Unit::TestCase
         home = nil
         ogroup = nil
         assert_nothing_raised {
-            user = Puppet.type(:user).create(
+            user = Puppet::Type.type(:user).new(
                 :name => "pptestu",
                 :home => file,
                 :gid => "pptestg",
                 :groups => "yayness"
             )
-            home = Puppet.type(:file).create(
+            home = Puppet::Type.type(:file).new(
                 :path => file,
                 :owner => "pptestu",
                 :ensure => "directory"
             )
-            group = Puppet.type(:group).create(
+            group = Puppet::Type.type(:group).new(
                 :name => "pptestg"
             )
-            ogroup = Puppet.type(:group).create(
+            ogroup = Puppet::Type.type(:group).new(
                 :name => "yayness"
             )
             comp = mk_catalog(user, group, home, ogroup)
         }
-        
+
         rels = nil
         assert_nothing_raised() { rels = user.autorequire }
 
@@ -388,7 +388,7 @@ class TestUser < Test::Unit::TestCase
         assert_equal("Puppet Testing User", user.provider.comment,
             "Comment was not set")
 
-        tests = Puppet.type(:user).validproperties
+        tests = Puppet::Type.type(:user).validproperties
 
         tests.each { |test|
             if self.respond_to?("attrtest_%s" % test)
@@ -401,11 +401,12 @@ class TestUser < Test::Unit::TestCase
         user[:ensure] = :absent
         assert_apply(user)
     end
-    
+
     # Testing #455
     def test_autorequire_with_no_group_should
-        user = Puppet::Type.type(:user).create(:name => "yaytest", :check => :all)
-        
+        user = Puppet::Type.type(:user).new(:name => "yaytest", :check => :all)
+        catalog = mk_catalog(user)
+
         assert_nothing_raised do
             user.autorequire
         end
@@ -423,7 +424,7 @@ class TestUser < Test::Unit::TestCase
     # Make sure the 'managehome' param can only be set when the provider
     # has that feature.  Uses a patch from #432.
     def test_managehome
-        user = Puppet::Type.type(:user).create(:name => "yaytest", :check => :all)
+        user = Puppet::Type.type(:user).new(:name => "yaytest", :check => :all)
 
         prov = user.provider
 
@@ -434,7 +435,7 @@ class TestUser < Test::Unit::TestCase
             user[:managehome] = false
         end
 
-        assert_raise(ArgumentError, "did not fail when managehome? is false") do
+        assert_raise(Puppet::Error, "did not fail when managehome? is false") do
             user[:managehome] = true
         end
 

data/test/ral/type/yumrepo.rb

@@ -6,7 +6,7 @@ require 'puppettest'
 require 'fileutils'
 
 class TestYumRepo < Test::Unit::TestCase
-	include PuppetTest
+    include PuppetTest
 
     def setup
         super
@@ -16,7 +16,10 @@ class TestYumRepo < Test::Unit::TestCase
         File.open(@yumconf, "w") do |f|
             f.print "[main]\nreposdir=#{@yumdir} /no/such/dir\n"
         end
-        Puppet.type(:yumrepo).yumconf = @yumconf
+        Puppet::Type.type(:yumrepo).yumconf = @yumconf
+
+        # It needs to be reset each time, otherwise the cache is used.
+        Puppet::Type.type(:yumrepo).inifile = nil
     end
 
     # Modify one existing section
@@ -24,19 +27,17 @@ class TestYumRepo < Test::Unit::TestCase
         copy_datafiles
         devel = make_repo("development", { :descr => "New description" })
         current_values = devel.retrieve
+
         assert_equal("development", devel[:name])
-        assert_equal('Fedora Core $releasever - Development Tree', 
-                     current_values[devel.property(:descr)])
-        assert_equal('New description', 
-                     devel.property(:descr).should)
+        assert_equal('Fedora Core $releasever - Development Tree', current_values[devel.property(:descr)])
+        assert_equal('New description', devel.property(:descr).should)
         assert_apply(devel)
-        inifile = Puppet.type(:yumrepo).read()
+
+        inifile = Puppet::Type.type(:yumrepo).read()
         assert_equal('New description', inifile['development']['name'])
-        assert_equal('Fedora Core $releasever - $basearch - Base',
-                     inifile['base']['name'])
+        assert_equal('Fedora Core $releasever - $basearch - Base', inifile['base']['name'])
         assert_equal("foo\n  bar\n  baz", inifile['base']['exclude'])
-        assert_equal(['base', 'development', 'main'],
-                     all_sections(inifile))
+        assert_equal(['base', 'development', 'main'], all_sections(inifile))
     end
 
     # Create a new section
@@ -55,7 +56,7 @@ class TestYumRepo < Test::Unit::TestCase
         repo = make_repo("base", values)
 
         assert_apply(repo)
-        inifile = Puppet.type(:yumrepo).read()
+        inifile = Puppet::Type.type(:yumrepo).read()
         sections = all_sections(inifile)
         assert_equal(['base', 'main'], sections)
         text = inifile["base"].format
@@ -66,12 +67,12 @@ class TestYumRepo < Test::Unit::TestCase
     def test_absent
         copy_datafiles
         baseurl = 'http://example.com/'
-        devel = make_repo("development", 
+        devel = make_repo("development",
                           { :mirrorlist => 'absent',
                             :baseurl => baseurl })
         devel.retrieve
         assert_apply(devel)
-        inifile = Puppet.type(:yumrepo).read()
+        inifile = Puppet::Type.type(:yumrepo).read()
         sec = inifile["development"]
         assert_nil(sec["mirrorlist"])
         assert_equal(baseurl, sec["baseurl"])
@@ -79,7 +80,7 @@ class TestYumRepo < Test::Unit::TestCase
 
     def make_repo(name, hash={})
         hash[:name] = name
-        Puppet.type(:yumrepo).create(hash)
+        Puppet::Type.type(:yumrepo).new(hash)
     end
 
     def all_sections(inifile)
@@ -96,7 +97,7 @@ class TestYumRepo < Test::Unit::TestCase
             FileUtils::copy(src, dst)
         }
     end
-    
+
     CREATE_EXP = <<'EOF'
 [base]
 name=Fedora Core $releasever - $basearch - Base
@@ -109,4 +110,4 @@ proxy_username=username
 proxy_password=password
 EOF
 
-end        
+end

data/test/ral/type/zone.rb

@@ -21,7 +21,7 @@ class TestZone < PuppetTest::TestCase
         File.chmod(0700, base)
         root = File.join(base, "zonebase")
         assert_nothing_raised {
-            zone = Puppet::Type.type(:zone).create(
+            zone = Puppet::Type.type(:zone).new(
                 :name => name,
                 :path => root,
                 :ensure => "configured" # don't want to install zones automatically
@@ -173,13 +173,11 @@ class TestZoneAsRoot < TestZone
             h
         }
 
-        Puppet::Type.type(:zone).clear
-
         # Get rid of any lingering zones
         @@zones.each do |zone|
             next unless current.include? zone
 
-            obj = Puppet::Type.type(:zone).create(:name => zone)
+            obj = Puppet::Type.type(:zone).new(:name => zone)
             obj[:ensure] = :absent
             assert_apply(obj)
         end
@@ -346,7 +344,7 @@ end
 
         currentvalues = zone.retrieve
 
-        assert_equal(:absent, currentvalues[zone.property(:ensure)], 
+        assert_equal(:absent, currentvalues[zone.property(:ensure)],
                      "Zone is not absent")
     end
 
@@ -413,7 +411,7 @@ end
 
         currentvalues = zone.retrieve
 
-        assert_equal(:absent, currentvalues[zone.property(:ensure)], 
+        assert_equal(:absent, currentvalues[zone.property(:ensure)],
                      "Zone is not absent")
     end
 end

data/test/test

@@ -76,11 +76,11 @@ require 'getoptlong'
 include Find
 
 result = GetoptLong.new(
-    [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
-    [ "--verbose",	"-v",			GetoptLong::NO_ARGUMENT ],
-    [ "-n",			                GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--files",    "-f",           GetoptLong::NO_ARGUMENT ],
-    [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ]
+    [ "--debug",    "-d", GetoptLong::NO_ARGUMENT       ],
+    [ "--verbose",  "-v", GetoptLong::NO_ARGUMENT       ],
+    [ "-n",               GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--files",    "-f", GetoptLong::NO_ARGUMENT       ],
+    [ "--help",     "-h", GetoptLong::NO_ARGUMENT       ]
 )
 
 usage = "USAGE: %s [--help] suite" % $0
@@ -132,7 +132,7 @@ def resolve(dir)
     if dir.include?(File::SEPARATOR)
         basedir = dir.split(File::SEPARATOR)[0]
         if dirs.include?(basedir)
-            dirs.delete(basedir) 
+            dirs.delete(basedir)
             dirs << basedir
         end
     end
@@ -184,8 +184,8 @@ def run(files, flags = nil)
 
     files.each do |file|
         case File.stat(file).ftype
-        when "file": args << file
-        when "directory": args += ruby_files(file)
+        when "file"; args << file
+        when "directory"; args += ruby_files(file)
         else
             $stderr.puts "Skipping %s; can't handle %s" %
                 [file, File.stat(file).ftype]
@@ -236,6 +236,6 @@ end
 #    load file unless file =~ /^-/
 #end
 #
-#runner = Test::Unit::AutoRunner.new(false) 
+#runner = Test::Unit::AutoRunner.new(false)
 #runner.process_args
 #runner.run

data/test/util/fileparsing.rb

@@ -8,8 +8,8 @@ require 'puppet'
 require 'puppet/util/fileparsing'
 
 class TestUtilFileParsing < Test::Unit::TestCase
-	include PuppetTest
-	include PuppetTest::FileParsing
+    include PuppetTest
+    include PuppetTest::FileParsing
 
     class FParser
         include Puppet::Util::FileParsing
@@ -72,7 +72,7 @@ class TestUtilFileParsing < Test::Unit::TestCase
 
         # Make sure it matches
         assert_nothing_raised do
-            assert_equal({:record_type => :comment, :line => comment}, 
+            assert_equal({:record_type => :comment, :line => comment},
                  @parser.parse_line(comment))
         end
 
@@ -88,13 +88,13 @@ class TestUtilFileParsing < Test::Unit::TestCase
 
         # The comment should still match
         assert_nothing_raised do
-            assert_equal({:record_type => :comment, :line => comment}, 
+            assert_equal({:record_type => :comment, :line => comment},
                  @parser.parse_line(comment))
         end
 
         # As should our new line type
         assert_nothing_raised do
-            assert_equal({:record_type => :blank, :line => ""}, 
+            assert_equal({:record_type => :blank, :line => ""},
                  @parser.parse_line(""))
         end
 
@@ -141,12 +141,12 @@ class TestUtilFileParsing < Test::Unit::TestCase
         end
 
         assert_nothing_raised("Did not parse old comment") do
-            assert_equal({:record_type => :comment, :line => comment}, 
+            assert_equal({:record_type => :comment, :line => comment},
                  @parser.parse_line(comment))
         end
         comment = '" another type of comment'
         assert_nothing_raised("Did not parse new comment") do
-            assert_equal({:record_type => :comment2, :line => comment}, 
+            assert_equal({:record_type => :comment2, :line => comment},
                  @parser.parse_line(comment))
         end
 
@@ -318,7 +318,7 @@ class TestUtilFileParsing < Test::Unit::TestCase
             # Check parsing first
             result = @parser.parse_line(start)
             [:one, :two].each do |param|
-                assert_equal(record[param], result[param], 
+                assert_equal(record[param], result[param],
                     "Did not correctly parse %s" % start.inspect)
             end
 
@@ -598,8 +598,8 @@ billy three four\n"
 end
 
 class TestUtilFileRecord < Test::Unit::TestCase
-	include PuppetTest
-	include PuppetTest::FileParsing
+    include PuppetTest
+    include PuppetTest::FileParsing
 
     Record = Puppet::Util::FileParsing::FileRecord
     def test_new_filerecord