First round of bugfixes in preparation for 0.18.4

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1421 980ebf18-57e1-0310-9a29-db15c13687c0

4 files changed, 8 insertions, 6 deletions

diff --git a/test/language/functions.rb b/test/language/functions.rb
index 1ee7ccf8e..d931470fc 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -224,6 +224,7 @@ class TestLangFunctions < Test::Unit::TestCase
         assert_equal("original text\n", fileobj["content"],
             "Template did not work")
 
+        Puppet[:filetimeout] = 0
         # Have to sleep because one second is the fs's time granularity.
         sleep(1)
 
diff --git a/test/server/master.rb b/test/server/master.rb
index e3f065087..18e23311c 100644
--- a/test/server/master.rb
+++ b/test/server/master.rb
@@ -102,6 +102,8 @@ class TestMaster < Test::Unit::TestCase
     end
 
     def test_filereread
+        # Start with a normal setting
+        Puppet[:filetimeout] = 15
         manifest = mktestmanifest()
 
         file2 = @createdfile + "2"
@@ -113,8 +115,7 @@ class TestMaster < Test::Unit::TestCase
             master = Puppet::Server::Master.new(
                 :Manifest => manifest,
                 :UseNodes => false,
-                :Local => true,
-                :FileTimeout => 15
+                :Local => true
             )
         }
         assert_nothing_raised() {
@@ -153,10 +154,8 @@ class TestMaster < Test::Unit::TestCase
         assert_equal(parse1, master.freshness, "Master did not wait through timeout")
         assert(client.fresh?, "Client is not up to date")
 
-        assert_nothing_raised("Could not resent the file timeout") {
-            master.filetimeout = 0
-        }
-        assert_equal(0, master.filetimeout)
+        # Then eliminate it
+        Puppet[:filetimeout] = 0
 
         # Now make sure the master does reparse
         #Puppet.notice "%s vs %s" % [parse1, master.freshness]
diff --git a/test/types/host.rb b/test/types/host.rb
index b842c1cfb..2e5121451 100755
--- a/test/types/host.rb
+++ b/test/types/host.rb
@@ -21,6 +21,7 @@ class TestHost < Test::Unit::TestCase
     end
 
     def teardown
+        Puppet::FileType.filetype(:ram).clear
         @hosttype.filetype = @oldhosttype
         Puppet.type(:file).clear
         super
diff --git a/test/types/sshkey.rb b/test/types/sshkey.rb
index 5186d06cc..ff9adc336 100755
--- a/test/types/sshkey.rb
+++ b/test/types/sshkey.rb
@@ -22,6 +22,7 @@ class TestSSHKey < Test::Unit::TestCase
     end
 
     def teardown
+        Puppet::FileType.filetype(:ram).clear
         @sshtype.filetype = @oldfiletype
         Puppet.type(:file).clear
         super