puppet 0.25.4 → 0.25.5

data/spec/unit/util/zaml.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+
+require 'puppet/util/monkey_patches'
+
+describe "Pure ruby yaml implementation" do
+    {
+    7            => "--- 7",
+    3.14159      => "--- 3.14159",
+    'test'       => "--- test",
+    []           => "--- []",
+    :symbol      => "--- !ruby/sym symbol",
+    {:a => "A"}  => "--- \n  !ruby/sym a: A"
+    }.each { |o,y| 
+        it "should convert the #{o.class} #{o.inspect} to yaml" do
+            o.to_yaml.should == y
+        end
+        it "should produce yaml for the #{o.class} #{o.inspect} that can be reconstituted" do
+            YAML.load(o.to_yaml).should == o
+        end
+    }
+    #
+    # Can't test for equality on raw objects
+    {
+    Object.new                   => "--- !ruby/object {}",
+    [Object.new]                 => "--- \n  - !ruby/object {}",
+    {Object.new => Object.new}   => "--- \n  ? !ruby/object {}\n  : !ruby/object {}"
+    }.each { |o,y| 
+        it "should convert the #{o.class} #{o.inspect} to yaml" do
+            o.to_yaml.should == y
+        end
+        it "should produce yaml for the #{o.class} #{o.inspect} that can be reconstituted" do
+            lambda { YAML.load(o.to_yaml) }.should_not raise_error
+        end
+    }
+end
+

data/tasks/rake/changelog.rake

@@ -8,7 +8,7 @@ task :changelog do
 
     CHANGELOG_DIR = "#{Dir.pwd}"
     mkdir(CHANGELOG_DIR) unless File.directory?(CHANGELOG_DIR)
-    change_body = `git-changelog --no-limit -a`
+    change_body = `git-changelog --limit=99999`
     File.open(File.join(CHANGELOG_DIR, "CHANGELOG"), 'w') do |f|
         f << change_body
     end

data/tasks/rake/gem.rake

@@ -30,9 +30,9 @@ spec = Gem::Specification.new do |spec|
     spec.add_dependency('facter', '>= 1.5.1')
     spec.summary = 'Puppet, an automated configuration management tool'
     spec.description = 'Puppet, an automated configuration management tool'
-    spec.author = 'Reductive Labs'
-    spec.email = 'puppet@reductivelabs.com'
-    spec.homepage = 'http://reductivelabs.com'
+    spec.author = 'Puppet Labs'
+    spec.email = 'puppet@puppetlabs.com'
+    spec.homepage = 'http://puppetlabs.com'
     spec.rubyforge_project = 'puppet'
     spec.has_rdoc = true
     spec.rdoc_options <<

data/tasks/rake/git_workflow.rake

@@ -1,5 +1,5 @@
 # This set of tasks helps automate the workflow as described on
-# http://reductivelabs.com/trac/puppet/wiki/Development/DevelopmentLifecycle
+# http://puppetlabs.com/trac/puppet/wiki/Development/DevelopmentLifecycle
 
 
 def find_start(start)

data/tasks/rake/sign.rake

@@ -1,4 +1,4 @@
-desc "Sign to the package with the Reductive Labs release key"
+desc "Sign to the package with the Puppet Labs release key"
 task :sign_packages do
 
 version = Puppet::PUPPETVERSION

data/tasks/rake/yard.rake

@@ -0,0 +1,11 @@
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new do |t|
+    t.files = ['lib/**/*.rb', 'spec/**/*.rb']
+  end
+
+rescue LoadError
+  # yard not installed (gem install yard)
+  #   # http://yardoc.org
+end

data/test/certmgr/certmgr.rb

@@ -126,7 +126,7 @@ class TestCertMgr < Test::Unit::TestCase
                 :city => "Nashville",
                 :country => "US",
                 :email => "luke@madstop.com",
-                :org => "Reductive",
+                :org => "Puppet",
                 :ou => "Development",
                 :encrypt => mkPassFile()
             )

data/test/data/providers/ssh_authorized_key/parsed/authorized_keys

@@ -1,7 +1,7 @@
 ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= francois.deppierraz@nimag.net
 ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz <francois@ctrlaltdel.ch>
 from="192.168.1.1",command="/bin/false",no-pty,no-port-forwarding ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz
-from="192.168.1.1, www.reductivelabs.com",command="/bin/false",no-pty,no-port-forwarding ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz
+from="192.168.1.1, www.puppetlabs.com",command="/bin/false",no-pty,no-port-forwarding ssh-dss AAAAB3NzaC1kc3MAAACBAJkupmdsJSDXfUy5EU5NTRBDr9Woo3w0YnB8KmnJW9ghU8C7SkWPB1fIHVe+esFfd3qWBseb83PoFX63geZJAg6bjV4/Rdn1zEoa9EO2QyUdYUen4+rpsh3vVKZ6HFNsn3+W5+kPYgE1F/N4INqkbjY3sqCkP/W1BL9+sbVVbuJFAAAAFQCfjWDk5XhvGUkPjNWWVqltBYzHtwAAAIEAg/XL7ky7x9Ad5banzPFAfmM+DGFe0A/JEbLDjKmr5KBM5x4RFohtEvZ8ECuVGUOqBWdgAjyYwsG4oRVjLnKrf/rgmbNRzSFgEWkcAye3BVwk7Dt6hh4knEl+mNfOLq+FH0011UhecOiqTcESMzQDtgQ1vJh2VchElBLjl3x/ZugAAACAAh5jGQC338t5ObP8trSlOefkx0sXmmEzUbo3Mt8mGUuGJPx8m+X0L8Xd+l5rQxytqE3SmV/RD+6REqBuPqHM8RQuqAzfjdOeg/Ajdggx1CRMTVhltZsgQoxO30cz9Qo0SdPoL+Jp1fLuaLZq7m/RmsWYvoLT3jebBlpvvQE8YlI= Francois Deppierraz
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2Vi+TdC3iOGYcIo5vGTvC9P9rjHl9RxCuZmSfn+YDFQ35RXf0waijtjp9I7GYh6R4hBjA5z0u/Pzi95LET5NfRM0Gdc0DJyvBI7K+ALBxIT383Iz6Yz4iKxe1TEJgHGM2he4+7BHkjc3kdIZqIpZjucCk4VsXSxujO4MKKvtaKK2l+kahlLQHHw/vZkDpIgL52iGVsjW9l8RLJaKHZ4mDHJN/Q/Rzn2W4EvcdHUzwhvGMwZlm8clDwITBrSsawYtnivJrQSYcmTRqJuS8wprNDrLIhTGjrwFg5WpruUuMt6fLuCqwe6TeEL+nh3DQ4g554c5aRp3oU6LGBKTvNZGWQ== francois@korn
 ssh-dss AAAAB3NzaC1kc3MAAACBAMPpCYnjywOemd8LqbbmC+bePNR3/H1rXsiFwjSLhYE3bbOpvclvOzN1DruFc34m0FopVnMkP+aubjdIYF8pijl+5hg9ggB7Kno2dl0Dd1rGN/swvmhA8OpLAQv7Qt7UnXKVho3as08zYZsrHxYFu0wlnkdbsv4cy4aXyQKd4MPVAAAAFQDSyQFWg8Qt3wU05buhZ10psoR7tQAAAIEAmAhguXwUnI3P2FF5NAW/mpJUmUERdL4pyZARUyAgpf7ezwrh9TJqrvGTQNBF97Xqaivyncm5JWQdMIsTBxEFaXZGkmBta02KnWcn447qvIh7iv8XpNL6M9flCkBEZOJ4t9El0ytTSHHaiCz8A20Et+E8evWyi1kXkFDt8ML2dGgAAACBAK0X4ympbdEjgV/ZyOc+BU22u7vOnfSOUJmyar4Ax1MIDNnoyNWKnGvxRutydQcQOKQHZEU0fE8MhPFn6nLF6CoVfEl/oz0EYz3hjV4WPFpHrF5DY/rhvNj8iuneKJ5P0dy/rG6m5qey25PnHyGFVoIRlkHJvBCJT40dHs40YEjI francois@korn
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAut8aOSxenjOqF527dlsdHWV4MNoAsX14l9M297+SQXaQ5Z3BedIxZaoQthkDALlV/25A1COELrg9J2MqJNQc8Xe9XQOIkBQWWinUlD/BXwoOTWEy8C8zSZPHZ3getMMNhGTBO+q/O+qiJx3y5cA4MTbw2zSxukfWC87qWwcZ64UUlegIM056vPsdZWFclS9hsROVEa57YUMrehQ1EGxT4Z5j6zIopufGFiAPjZigq/vqgcAqhAKP6yu4/gwO6S9tatBeEjZ8fafvj1pmvvIplZeMr96gHE7xS3pEEQqnB3nd4RY7AF6j9kFixnsytAUO7STPh/M3pLiVQBN89TvWPQ==

data/test/lib/puppettest/support/utils.rb

@@ -154,11 +154,12 @@ end
 module PuppetTest
     include PuppetTest::Support::Utils
 
-    def self.fakedata(dir,pat='*')
+    def fakedata(dir,pat='*')
         glob = "#{basedir}/test/#{dir}/#{pat}"
         files = Dir.glob(glob,File::FNM_PATHNAME)
         raise Puppet::DevError, "No fakedata matching #{glob}" if files.empty?
         files
     end
+    module_function :fakedata
 
 end

data/test/network/handler/ca.rb

@@ -69,7 +69,7 @@ class TestCA < Test::Unit::TestCase
         newtext = nil
         assert_nothing_raised {
             newtext, cacerttext = ca.getcert(
-                cert.csr.to_s, "test.reductivelabs.com", "127.0.0.1"
+                cert.csr.to_s, "test.puppetlabs.com", "127.0.0.1"
             )
         }
 
@@ -110,7 +110,7 @@ class TestCA < Test::Unit::TestCase
         certtext = nil
         assert_nothing_raised {
             certtext, cacerttext = caserv.getcert(
-                cert.csr.to_s, "test.reductivelabs.com", "127.0.0.1"
+                cert.csr.to_s, "test.puppetlabs.com", "127.0.0.1"
             )
         }
 
@@ -167,7 +167,7 @@ class TestCA < Test::Unit::TestCase
         # make sure we know what's going on
         assert(caserv.autosign?("hostmatch.domain.com"))
         assert(caserv.autosign?("fakehost.other.com"))
-        assert(!caserv.autosign?("kirby.reductivelabs.com"))
+        assert(!caserv.autosign?("kirby.puppetlabs.com"))
         assert(!caserv.autosign?("culain.domain.com"))
     end
 
@@ -181,7 +181,7 @@ class TestCA < Test::Unit::TestCase
         # make sure we know what's going on
         assert(!caserv.autosign?("hostmatch.domain.com"))
         assert(!caserv.autosign?("fakehost.other.com"))
-        assert(!caserv.autosign?("kirby.reductivelabs.com"))
+        assert(!caserv.autosign?("kirby.puppetlabs.com"))
         assert(!caserv.autosign?("culain.domain.com"))
     end
 

data/test/network/handler/fileserver.rb

@@ -947,12 +947,16 @@ allow *
          end
 
         # Now, check that they use Facter info
-        Puppet.notice "The following messages are normal"
         client = nil
-        Facter.stubs(:value).with(:ipaddress).returns("127.0.0.1")
         Facter.stubs(:value).with { |v| v.to_s == "hostname" }.returns("myhost")
         Facter.stubs(:value).with { |v| v.to_s == "domain" }.returns("mydomain.com")
-        Facter.stubs(:value).with(:domain).returns("mydomain.com")
+
+        Facter.stubs(:to_hash).returns({
+            :ipaddress => "127.0.0.1",
+            :hostname => "myhost",
+            :domain   => "mydomain.com",
+        })
+
 
         {"%h" => "myhost", # Short name
          "%H" => "myhost.mydomain.com", # Full name
@@ -979,13 +983,15 @@ allow *
 
         # When mocks attack, part 2
         kernel_fact = Facter.value(:kernel)
-        Facter.stubs(:value).with(:kernel).returns(kernel_fact)
 
-        Facter.stubs(:value).with(:ipaddress).returns("127.0.0.1")
-        Facter.stubs(:value).with { |v| v.to_s == "hostname" }.returns("myhost")
-        Facter.stubs(:value).with { |v| v.to_s == "domain" }.returns("mydomain.com")
-        Facter.stubs(:value).with(:domain).returns("mydomain.com")
-        ip = Facter.value(:ipaddress)
+        ip = '127.0.0.1'
+
+        Facter.stubs(:to_hash).returns({
+            :kernel => kernel_fact,
+            :ipaddress => "127.0.0.1",
+            :hostname => "myhost",
+            :domain   => "mydomain.com",
+        })
 
         Dir.mkdir(dir)
         host = "myhost.mydomain.com"

data/test/other/transactions.rb

@@ -368,7 +368,7 @@ class TestTransactions < Test::Unit::TestCase
 
         # 'subscribe' expects an array of arrays
         #component[:require] = [[file.class.name,file.name]]
-        ecomp[:subscribe] = fcomp
+        ecomp[:subscribe] = fcomp.ref
         exec[:refreshonly] = true
 
         trans = assert_events([], config)
@@ -555,11 +555,6 @@ class TestTransactions < Test::Unit::TestCase
                 "Generated %s was not a vertex" % name)
             assert($finished.include?(name), "%s was not finished" % name)
         end
-
-        # Now make sure that cleanup gets rid of those generated types.
-        assert_nothing_raised do
-            trans.cleanup
-        end
     end
 
     def test_ignore_tags?

data/test/puppet/tc_suidmanager.rb

@@ -11,7 +11,10 @@ class TestSUIDManager < Test::Unit::TestCase
     include PuppetTest
 
     def setup
-        @user = nonrootuser
+        the_id = 42
+        Puppet::Util::SUIDManager.stubs(:convert_xid).returns(the_id)
+        Puppet::Util::SUIDManager.stubs(:initgroups)
+        @user = stub('user', :uid => the_id, :gid => the_id, :name => 'name')
         super
     end
 
@@ -39,13 +42,14 @@ class TestSUIDManager < Test::Unit::TestCase
     end
 
     def test_utiluid
-        assert_not_equal(nil, Puppet::Util.uid(@user.name))
+        assert_not_equal(nil, Puppet::Util.uid(nonrootuser.name))
     end
 
     def test_asuser_as_root
         Process.stubs(:uid).returns(0)
         expects_id_set_and_revert @user.uid, @user.gid
         Puppet::Util::SUIDManager.asuser @user.uid, @user.gid do end
+    rescue Errno::EPERM
     end
 
     def test_asuser_as_nonroot
@@ -96,6 +100,7 @@ class TestSUIDManager < Test::Unit::TestCase
     private
 
     def expects_id_set_and_revert(uid, gid)
+        Process.stubs(:groups=)
         Process.expects(:euid).returns(99997)
         Process.expects(:egid).returns(99996)
 

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

@@ -45,7 +45,7 @@ class TestParsedHostProvider < Test::Unit::TestCase
         return {
             :name => "fakehost%s" % @hcount,
             :ip => "192.168.27.%s" % @hcount,
-            :alias => ["alias%s" % @hcount],
+            :host_aliases => ["alias%s" % @hcount],
             :ensure => :present
         }
     end
@@ -67,7 +67,7 @@ class TestParsedHostProvider < Test::Unit::TestCase
 
     # Make sure we convert both directlys correctly using a simple host.
     def test_basic_isomorphism
-        hash = {:record_type => :parsed, :name => "myhost", :ip => "192.168.43.56", :alias => %w{another host}}
+        hash = {:record_type => :parsed, :name => "myhost", :ip => "192.168.43.56", :host_aliases => %w{another host}}
 
         str = nil
         assert_nothing_raised do
@@ -103,7 +103,7 @@ class TestParsedHostProvider < Test::Unit::TestCase
         assert_equal([
             {:record_type => :comment, :line => "# comment one"},
             {:record_type => :blank, :line => ""},
-            {:record_type => :parsed, :name => "myhost", :ip => "192.168.43.56", :alias => %w{another host}},
+            {:record_type => :parsed, :name => "myhost", :ip => "192.168.43.56", :host_aliases => %w{another host}},
             {:record_type => :blank, :line => "    "},
             {:record_type => :comment, :line => "# another comment"},
             {:record_type => :parsed, :name => "anotherhost", :ip => "192.168.43.57"}
@@ -150,13 +150,13 @@ class TestParsedHostProvider < Test::Unit::TestCase
         }
 
         # Remove a single field and make sure it gets tossed
-        name = host.alias
-        host.alias = [:absent]
+        name = host.host_aliases
+        host.host_aliases = [:absent]
 
         assert_nothing_raised {
             host.flush
             assert(! file.read.include?(name[0]),
-                "Did not remove alias from disk")
+                "Did not remove host_aliases from disk")
         }
 
         # Make sure it throws up if we remove a required field

data/test/ral/providers/package.rb

@@ -238,6 +238,10 @@ class TestPackageProvider < Test::Unit::TestCase
         end
     end
 
+    def test_dont_complain_if_theres_nothing_to_test
+        assert("sometimes the above metaprogramming fails to find anything to test and the runner complains")
+    end
+
     def modpkg(pkg)
         case pkg[:provider]
         when :sun

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

@@ -32,7 +32,7 @@ class TestParsedSSHKey < Test::Unit::TestCase
         args = {
             :name => name || "/fspuppet%s" % @pcount,
             :key => "thisismykey%s" % @pcount,
-            :alias => ["host1.domain.com","192.168.0.1"],
+            :host_aliases => ["host1.domain.com","192.168.0.1"],
             :type => "dss",
             :ensure => :present
         }
@@ -68,11 +68,11 @@ class TestParsedSSHKey < Test::Unit::TestCase
             key.flush
         end
 
-        assert(key.alias, "No alias set for key")
+        assert(key.host_aliases, "No host_aliases set for key")
 
         hash = key.property_hash.dup
         text = @provider.target_object(file).read
-        names = [key.name, key.alias].flatten.join(",")
+        names = [key.name, key.host_aliases].flatten.join(",")
 
         assert_equal("#{names} #{key.type} #{key.key}\n", text)
 
@@ -94,12 +94,12 @@ class TestParsedSSHKey < Test::Unit::TestCase
             result = @provider.parse_line("one,two type key")
         end
         assert_equal("one", result[:name], "Did not call post hook")
-        assert_equal(%w{two}, result[:alias], "Did not call post hook")
+        assert_equal(%w{two}, result[:host_aliases], "Did not call post hook")
 
         assert_equal("one,two type key",
             @provider.to_line(:record_type => :parsed,
             :name => "one",
-            :alias => %w{two},
+            :host_aliases => %w{two},
             :type => "type",
             :key => "key"),
             "Did not use pre-hook when generating line"

data/test/ral/type/file.rb

@@ -978,25 +978,4 @@ class TestFile < Test::Unit::TestCase
         assert_equal("/", obj.title, "/ directory was changed to empty string")
     end
 
-    # #1010 and #1037 -- write should fail if the written checksum does not
-    # match the file we thought we were writing.
-    def test_write_validates_checksum
-        file = tempfile
-        inst = Puppet::Type.newfile(:path => file, :content => "something")
-
-        tmpfile = file + ".puppettmp"
-
-        wh = mock 'writehandle', :print => nil
-        rh = mock 'readhandle'
-        rh.expects(:read).with(4096).times(2).returns("other").then.returns(nil)
-        File.expects(:open).with { |*args| args[0] == tmpfile and args[1] != "r" }.yields(wh)
-        File.expects(:open).with { |*args| args[0] == tmpfile and args[1] == "r" }.yields(rh)
-
-        File.stubs(:rename)
-        FileTest.stubs(:exist?).returns(true)
-        FileTest.stubs(:file?).returns(true)
-
-        inst.expects(:fail)
-        inst.write("something", :whatever)
-    end
 end

data/test/ral/type/host.rb

@@ -108,7 +108,7 @@ class TestHost < Test::Unit::TestCase
         # This was a hard bug to track down.
         assert_instance_of(String, current_values[host.property(:ip)])
 
-        host[:alias] = %w{madstop kirby yayness}
+        host[:host_aliases] = %w{madstop kirby yayness}
 
         assert_events([:host_changed], host)
 
@@ -117,7 +117,7 @@ class TestHost < Test::Unit::TestCase
         }
 
         assert_equal(%w{madstop kirby yayness},
-                     current_values[host.property(:alias)])
+                     current_values[host.property(:host_aliases)])
 
         host[:ensure] = :absent
         assert_events([:host_removed], host)
@@ -184,13 +184,13 @@ class TestHost < Test::Unit::TestCase
     end
 
     def test_aliasisproperty
-        assert_equal(:property, @hosttype.attrtype(:alias))
+        assert_equal(:property, @hosttype.attrtype(:host_aliases))
     end
 
     def test_multivalues
         host = mkhost
         assert_raise(Puppet::Error) {
-            host[:alias] = "puppetmasterd yayness"
+            host[:host_aliases] = "puppetmasterd yayness"
         }
     end
 

data/test/ral/type/resources.rb

@@ -59,70 +59,6 @@ class TestResources < Test::Unit::TestCase
         @type = Puppet::Type.type(:resources)
     end
 
-    def test_purge
-        # Create a purgeable type
-        mkpurgertype
-
-        purger = nil
-        assert_nothing_raised do
-            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
-        assert_nothing_raised do
-            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
-            genned = purger.generate
-        end
-        assert(genned, "Did not get any generated resources")
-
-        genned.each do |res|
-            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|
-                assert_equal(purger[param], res[param], "metaparam %s did not carry over" % param)
-            end
-        end
-    end
-
     # Part of #408.
     def test_check
         # First check a non-user
@@ -173,19 +109,5 @@ class TestResources < Test::Unit::TestCase
         end
     end
 
-    # The other half of #408.
-    def test_check_is_called
-        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)
-            }
-        assert(bad.empty?, "incorrectly passed users %s" % bad.collect { |u| u[:name]}.join(", "))
-    end
 end