Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x

5 files changed, 5 insertions, 15 deletions

diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 67c47fa6d..41796575f 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -216,15 +216,7 @@ end
         name = "environment"
         value = "test_environment"
 
-        Puppet[:filetimeout] = -1
-        Puppet[:factsource] = tempfile()
-        Dir.mkdir(Puppet[:factsource])
-        file = File.join(Puppet[:factsource], "#{name}.rb")
-        File.open(file, "w") do |f|
-            f.puts %{Facter.add("#{name}") do setcode { "#{value}" } end }
-        end
-
-        Puppet::Network::Client.master.getfacts
+        Facter.stubs(:to_hash).returns(name => value)
 
         assert_equal(value, Puppet::Network::Client.master.facts[name])
     end
diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb
index d83115b1a..7c99ac38d 100755
--- a/test/rails/railsparameter.rb
+++ b/test/rails/railsparameter.rb
@@ -25,6 +25,8 @@ class TestRailsParameter < Test::Unit::TestCase
         source = parser.newclass "myclass"
 
         host = Puppet::Rails::Host.new(:name => "myhost")
+
+        host.save
         
         resource = host.resources.create(
             :title => "/tmp/to_resource", 
diff --git a/test/rails/railsresource.rb b/test/rails/railsresource.rb
index 58058472d..3df5001be 100755
--- a/test/rails/railsresource.rb
+++ b/test/rails/railsresource.rb
@@ -29,6 +29,7 @@ class TestRailsResource < Test::Unit::TestCase
     def mktest_resource
         # We need a host for resources
         host = Puppet::Rails::Host.new(:name => "myhost")
+        host.save
 
         # Now build a resource
         resource = host.resources.create(
diff --git a/test/ral/type/file.rb b/test/ral/type/file.rb
index cbbe818ae..5cf989aa3 100755
--- a/test/ral/type/file.rb
+++ b/test/ral/type/file.rb
@@ -185,12 +185,6 @@ class TestFile < Test::Unit::TestCase
             initgroup = File.stat(file).gid
             obj[:group] = group.name
 
-            assert_events([:file_changed], obj)
-            assert_equal(initgroup, File.stat(file).gid)
-            assert_equal(group.gid, File.lstat(link).gid)
-            File.chown(nil, initgroup, file)
-            File.lchown(nil, initgroup, link)
-
             obj[:links] = :follow
             assert_events([:file_changed], obj)
             assert_equal(group.gid, File.stat(file).gid)
diff --git a/test/ral/type/tidy.rb b/test/ral/type/tidy.rb
index 60fad6516..17f98df22 100755
--- a/test/ral/type/tidy.rb
+++ b/test/ral/type/tidy.rb
@@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/support/utils'
+require 'puppet/type/tidy'
 
 class TestTidy < Test::Unit::TestCase
     include PuppetTest::Support::Utils