summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-03-09 16:38:05 -0700
committerLuke Kanies <luke@madstop.com>2008-04-15 21:34:03 -0500
commitbb87464f75cf3ea2e17bb660e7d1880bc36e141f (patch)
tree82edcc42a725df83fffdca1eb72b65136598df7d
parentb0811ad60527e97554e3f3e1f64d961fc72077b1 (diff)
downloadpuppet-bb87464f75cf3ea2e17bb660e7d1880bc36e141f.tar.gz
puppet-bb87464f75cf3ea2e17bb660e7d1880bc36e141f.tar.xz
puppet-bb87464f75cf3ea2e17bb660e7d1880bc36e141f.zip
Fixing a couple of broken tests.
-rwxr-xr-xspec/unit/ral/type/file.rb2
-rwxr-xr-xtest/lib/puppettest.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/spec/unit/ral/type/file.rb b/spec/unit/ral/type/file.rb
index 83546bef0..90346849a 100755
--- a/spec/unit/ral/type/file.rb
+++ b/spec/unit/ral/type/file.rb
@@ -10,6 +10,8 @@ describe Puppet::Type.type(:file) do
@file = Puppet::Type::File.create(:name => @path)
end
+ after { Puppet::Type::File.clear }
+
describe "when used with content and replace=>false" do
before do
@file[:content] = "foo"
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index 40764e38c..6c1e059b8 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -233,6 +233,7 @@ module PuppetTest
end
f = File.join(self.tmpdir(), "tempfile_" + @@tmpfilenum.to_s)
+ @@tmpfiles ||= []
@@tmpfiles << f
return f
end