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

24 files changed, 6 insertions, 11 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/types/basic.rb b/test/ral/type/basic.rb
index 3c5faeee0..3c5faeee0 100755
--- a/test/ral/types/basic.rb
+++ b/test/ral/type/basic.rb
diff --git a/test/ral/types/cron.rb b/test/ral/type/cron.rb
index 73e941894..73e941894 100755
--- a/test/ral/types/cron.rb
+++ b/test/ral/type/cron.rb
diff --git a/test/ral/types/exec.rb b/test/ral/type/exec.rb
index 4133d8519..e2a3dd9ed 100755
--- a/test/ral/types/exec.rb
+++ b/test/ral/type/exec.rb
@@ -394,8 +394,8 @@ class TestExec < Test::Unit::TestCase
         assert_apply(exec)
 
         assert_nothing_raised {
-            exec[:command] = "echo logoutput is warning"
-            exec[:logoutput] = "warning"
+            exec[:command] = "echo logoutput is on_failure"
+            exec[:logoutput] = "on_failure"
         }
 
         assert_apply(exec)
diff --git a/test/ral/types/file.rb b/test/ral/type/file.rb
index cbbe818ae..cbbe818ae 100755
--- a/test/ral/types/file.rb
+++ b/test/ral/type/file.rb
diff --git a/test/ral/types/file/target.rb b/test/ral/type/file/target.rb
index 035ea905b..035ea905b 100755
--- a/test/ral/types/file/target.rb
+++ b/test/ral/type/file/target.rb
diff --git a/test/ral/types/filebucket.rb b/test/ral/type/filebucket.rb
index f9706663b..f9706663b 100755
--- a/test/ral/types/filebucket.rb
+++ b/test/ral/type/filebucket.rb
diff --git a/test/ral/types/fileignoresource.rb b/test/ral/type/fileignoresource.rb
index ff867c879..ff867c879 100755
--- a/test/ral/types/fileignoresource.rb
+++ b/test/ral/type/fileignoresource.rb
diff --git a/test/ral/types/filesources.rb b/test/ral/type/filesources.rb
index a7bb6fefa..a7bb6fefa 100755
--- a/test/ral/types/filesources.rb
+++ b/test/ral/type/filesources.rb
diff --git a/test/ral/types/group.rb b/test/ral/type/group.rb
index d28c8eea5..d28c8eea5 100755
--- a/test/ral/types/group.rb
+++ b/test/ral/type/group.rb
diff --git a/test/ral/types/host.rb b/test/ral/type/host.rb
index a5d645bd1..a5d645bd1 100755
--- a/test/ral/types/host.rb
+++ b/test/ral/type/host.rb
diff --git a/test/ral/types/mailalias.rb b/test/ral/type/mailalias.rb
index ff1dd562a..ff1dd562a 100755
--- a/test/ral/types/mailalias.rb
+++ b/test/ral/type/mailalias.rb
diff --git a/test/ral/types/parameter.rb b/test/ral/type/parameter.rb
index e1b8e00b3..e1b8e00b3 100755
--- a/test/ral/types/parameter.rb
+++ b/test/ral/type/parameter.rb
diff --git a/test/ral/types/port.rb b/test/ral/type/port.rb
index e28904d55..e28904d55 100755
--- a/test/ral/types/port.rb
+++ b/test/ral/type/port.rb
diff --git a/test/ral/types/property.rb b/test/ral/type/property.rb
index 6a3370caa..6a3370caa 100755
--- a/test/ral/types/property.rb
+++ b/test/ral/type/property.rb
diff --git a/test/ral/types/resources.rb b/test/ral/type/resources.rb
index 0663fe795..0663fe795 100755
--- a/test/ral/types/resources.rb
+++ b/test/ral/type/resources.rb
diff --git a/test/ral/types/service.rb b/test/ral/type/service.rb
index 01533c63e..01533c63e 100755
--- a/test/ral/types/service.rb
+++ b/test/ral/type/service.rb
diff --git a/test/ral/types/sshkey.rb b/test/ral/type/sshkey.rb
index b9aed20e8..b9aed20e8 100755
--- a/test/ral/types/sshkey.rb
+++ b/test/ral/type/sshkey.rb
diff --git a/test/ral/types/tidy.rb b/test/ral/type/tidy.rb
index 60fad6516..60fad6516 100755
--- a/test/ral/types/tidy.rb
+++ b/test/ral/type/tidy.rb
diff --git a/test/ral/types/user.rb b/test/ral/type/user.rb
index b280acfed..b280acfed 100755
--- a/test/ral/types/user.rb
+++ b/test/ral/type/user.rb
diff --git a/test/ral/types/yumrepo.rb b/test/ral/type/yumrepo.rb
index 899a02135..899a02135 100755
--- a/test/ral/types/yumrepo.rb
+++ b/test/ral/type/yumrepo.rb
diff --git a/test/ral/types/zone.rb b/test/ral/type/zone.rb
index eb485b944..eb485b944 100755
--- a/test/ral/types/zone.rb
+++ b/test/ral/type/zone.rb