puppet 2.7.26 → 3.0.0.rc4

data/spec/integration/provider/mailalias/aliases_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'shared_behaviours/all_parsedfile_providers'
 

data/spec/integration/provider/mount_spec.rb

@@ -107,6 +107,7 @@ describe "mount provider (integration)", :unless => Puppet.features.microsoft_wi
               ["local", "journaled"].each do |options_setting|
                 describe "When setting options => #{options_setting}" do
                   it "should leave the system in the #{expected_final_state ? 'mounted' : 'unmounted'} state, #{expected_fstab_data ? 'with' : 'without'} data in /etc/fstab" do
+                    pending("Solaris: The mock :operatingsystem value does not get changed in lib/puppet/provider/mount/parsed.rb", Facter[:osfamily] == "Solaris")
                     @desired_options = options_setting
                     run_in_catalog(:ensure=>ensure_setting, :options => options_setting)
                     @mounted.should == expected_final_state

data/spec/integration/provider/package_spec.rb

@@ -1,7 +1,7 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-describe "Package provider", :'fails_on_ruby_1.9.2' => true do
+describe "Package provider" do
   include PuppetSpec::Files
 
   Puppet::Type.type(:package).providers.each do |name|
@@ -22,7 +22,7 @@ describe "Package provider", :'fails_on_ruby_1.9.2' => true do
         lambda { pkg.provider.install }.should raise_error
       end
 
-      it "should be able to get a list of existing packages", :fails_on_windows => true do
+      it "should be able to get a list of existing packages" do
         if provider.name == :msi
           Puppet[:vardir] = tmpdir('msi_package_var_dir')
         end

data/spec/integration/provider/service/init_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider = Puppet::Type.type(:service).provider(:init)
 
-describe provider, :'fails_on_ruby_1.9.2' => true do
+describe provider do
   describe "when running on FreeBSD" do
     before :each do
       Facter.stubs(:value).with(:operatingsystem).returns 'FreeBSD'

data/spec/integration/provider/ssh_authorized_key_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 
 require 'spec_helper'
 require 'puppet/file_bucket/dipper'

data/spec/integration/reference/providers_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/util/reference'

data/spec/integration/reports_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/reports'

data/spec/integration/resource/catalog_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Resource::Catalog do
@@ -48,7 +48,6 @@ describe Puppet::Resource::Catalog do
       Puppet::Resource::Catalog.indirection.stubs(:terminus).returns terminus
 
       node = mock 'node'
-      terminus.stubs(:validate)
       terminus.expects(:find).with { |request| request.options[:use_node] == node }
       Puppet::Resource::Catalog.indirection.find("me", :use_node => node)
     end

data/spec/integration/resource/type_collection_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet_spec/files'

data/spec/integration/ssl/certificate_authority_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_authority'

data/spec/integration/ssl/certificate_request_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_request'

data/spec/integration/ssl/certificate_revocation_list_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_revocation_list'

data/spec/integration/ssl/host_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/host'

data/spec/integration/transaction/report_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Transaction::Report do

data/spec/integration/transaction_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/transaction'
@@ -226,7 +226,7 @@ describe Puppet::Transaction do
     FileTest.should be_exists(newfile)
   end
 
-  it "should still trigger skipped resources", :'fails_on_ruby_1.9.2' => true do
+  it "should still trigger skipped resources" do
     catalog = mk_catalog
     catalog.add_resource(*Puppet::Type.type(:schedule).mkdefaultschedules)
 

data/spec/integration/type/exec_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet_spec/files'

data/spec/integration/type/file_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet_spec/files'
@@ -65,15 +65,14 @@ describe Puppet::Type.type(:file) do
   end
 
   it "should not attempt to manage files that do not exist if no means of creating the file is specified" do
-    file = described_class.new :path => path, :mode => 0755
-    catalog.add_resource file
+    source = tmpfile('source')
 
-    file.parameter(:mode).expects(:retrieve).never
+    catalog.add_resource described_class.new :path => source, :mode => 0755
 
-    status = catalog.apply.report.resource_statuses["File[#{path}]"]
+    status = catalog.apply.report.resource_statuses["File[#{source}]"]
     status.should_not be_failed
     status.should_not be_changed
-    File.should_not be_exist(path)
+    File.should_not be_exist(source)
   end
 
   describe "when ensure is absent" do
@@ -103,90 +102,88 @@ describe Puppet::Type.type(:file) do
 
   describe "when setting permissions" do
     it "should set the owner" do
-      FileUtils.touch(path)
-      owner = get_owner(path)
+      target = tmpfile_with_contents('target', '')
+      owner = get_owner(target)
 
-      file = described_class.new(
-        :name    => path,
+      catalog.add_resource described_class.new(
+        :name    => target,
         :owner   => owner
       )
 
-      catalog.add_resource file
       catalog.apply
 
-      get_owner(path).should == owner
+      get_owner(target).should == owner
     end
 
     it "should set the group" do
-      FileUtils.touch(path)
-      group = get_group(path)
+      target = tmpfile_with_contents('target', '')
+      group = get_group(target)
 
-      file = described_class.new(
-        :name    => path,
+      catalog.add_resource described_class.new(
+        :name    => target,
         :group   => group
       )
 
-      catalog.add_resource file
       catalog.apply
 
-      get_group(path).should == group
+      get_group(target).should == group
     end
 
     describe "when setting mode" do
       describe "for directories" do
-        let(:path) { tmpdir('dir_mode') }
+        let(:target) { tmpdir('dir_mode') }
 
         it "should set executable bits for newly created directories" do
-          catalog.add_resource described_class.new(:path => path, :ensure => :directory, :mode => 0600)
+          catalog.add_resource described_class.new(:path => target, :ensure => :directory, :mode => 0600)
+
           catalog.apply
 
-          (get_mode(path) & 07777).should == 0700
+          (get_mode(target) & 07777).should == 0700
         end
 
         it "should set executable bits for existing readable directories" do
-          File.should be_directory(path)
-          set_mode(0600, path)
+          set_mode(0600, target)
 
-          catalog.add_resource described_class.new(:path => path, :ensure => :directory, :mode => 0644)
+          catalog.add_resource described_class.new(:path => target, :ensure => :directory, :mode => 0644)
           catalog.apply
 
-          (get_mode(path) & 07777).should == 0755
+          (get_mode(target) & 07777).should == 0755
         end
 
         it "should not set executable bits for unreadable directories" do
           begin
-            catalog.add_resource described_class.new(:path => path, :ensure => :directory, :mode => 0300)
+            catalog.add_resource described_class.new(:path => target, :ensure => :directory, :mode => 0300)
+
             catalog.apply
 
-            (get_mode(path) & 07777).should == 0300
+            (get_mode(target) & 07777).should == 0300
           ensure
             # so we can cleanup
-            set_mode(0700, path)
+            set_mode(0700, target)
           end
         end
 
         it "should set user, group, and other executable bits" do
-          catalog.add_resource described_class.new(:path => path, :ensure => :directory, :mode => 0664)
+          catalog.add_resource described_class.new(:path => target, :ensure => :directory, :mode => 0664)
+
           catalog.apply
 
-          (get_mode(path) & 07777).should == 0775
+          (get_mode(target) & 07777).should == 0775
         end
 
         it "should set executable bits when overwriting a non-executable file" do
-          FileUtils.rmdir(path)
-          FileUtils.touch(path)
-          set_mode(0444, path)
+          target_path = tmpfile_with_contents('executable', '')
+          set_mode(0444, target_path)
 
-          catalog.add_resource described_class.new(:path => path, :ensure => :directory, :mode => 0666, :backup => false)
+          catalog.add_resource described_class.new(:path => target_path, :ensure => :directory, :mode => 0666, :backup => false)
           catalog.apply
 
-          (get_mode(path) & 07777).should == 0777
+          (get_mode(target_path) & 07777).should == 0777
+          File.should be_directory(target_path)
         end
       end
 
       describe "for files" do
-        let(:path) { tmpfile('file_mode') }
-
         it "should not set executable bits" do
           catalog.add_resource described_class.new(:path => path, :ensure => :file, :mode => 0666)
           catalog.apply
@@ -211,37 +208,41 @@ describe Puppet::Type.type(:file) do
         let(:link) { tmpfile('link_mode') }
 
         describe "when managing links" do
-          let(:target) { tmpfile('target') }
+          let(:link_target) { tmpfile('target') }
+
+          before :each do
+            FileUtils.touch(link_target)
+            File.chmod(0444, link_target)
+
+            File.symlink(link_target, link)
+          end
 
           it "should not set the executable bit on the link nor the target" do
-            FileUtils.touch(target)
-            File.chmod(0444, target)
-            File.symlink(target, link)
+            catalog.add_resource described_class.new(:path => link, :ensure => :link, :mode => 0666, :target => link_target, :links => :manage)
 
-            catalog.add_resource described_class.new(:path => link, :ensure => :link, :mode => 0666, :target => target, :links => :manage)
             catalog.apply
 
             (File.stat(link).mode & 07777) == 0666
-            (File.lstat(target).mode & 07777) == 0444
+            (File.lstat(link_target).mode & 07777) == 0444
           end
 
           it "should ignore dangling symlinks (#6856)" do
-            File.symlink(target, link)
+            File.delete(link_target)
 
-            catalog.add_resource described_class.new(:path => link, :ensure => :link, :mode => 0666, :target => target, :links => :manage)
+            catalog.add_resource described_class.new(:path => link, :ensure => :link, :mode => 0666, :target => link_target, :links => :manage)
             catalog.apply
 
             File.should_not be_exist(link)
           end
 
           it "should create a link to the target if ensure is omitted" do
-            FileUtils.touch(target)
-            catalog.add_resource described_class.new(:path => link, :target => target)
+            FileUtils.touch(link_target)
+            catalog.add_resource described_class.new(:path => link, :target => link_target)
             catalog.apply
 
             File.should be_exist link
             File.lstat(link).ftype.should == 'link'
-            File.readlink(link).should == target
+            File.readlink(link).should == link_target
           end
         end
 
@@ -258,83 +259,81 @@ describe Puppet::Type.type(:file) do
           end
 
           describe "to a directory" do
-            let(:target) { tmpdir('dir_target') }
+            let(:link_target) { tmpdir('dir_target') }
 
             before :each do
-              File.chmod(0600, target)
+              File.chmod(0600, link_target)
 
-              File.symlink(target, link)
+              File.symlink(link_target, link)
             end
 
             after :each do
-              File.chmod(0750, target)
+              File.chmod(0750, link_target)
             end
 
             describe "that is readable" do
               it "should set the executable bits when creating the destination (#10315)" do
+                pending "bug #10315"
+
                 catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
                 catalog.apply
 
-                File.should be_directory(path)
                 (get_mode(path) & 07777).should == 0777
               end
 
               it "should set the executable bits when overwriting the destination (#10315)" do
+                pending "bug #10315"
+
                 FileUtils.touch(path)
 
-                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow, :backup => false)
+                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
                 catalog.apply
 
-                File.should be_directory(path)
                 (get_mode(path) & 07777).should == 0777
               end
             end
 
             describe "that is not readable" do
               before :each do
-                set_mode(0300, target)
+                set_mode(0300, link_target)
               end
 
               # so we can cleanup
               after :each do
-                set_mode(0700, target)
+                set_mode(0700, link_target)
               end
 
-              it "should set executable bits when creating the destination (#10315)" do
+              it "should not set executable bits when creating the destination (#10315)" do
+                pending "bug #10315"
+
                 catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
                 catalog.apply
 
-                File.should be_directory(path)
-                (get_mode(path) & 07777).should == 0777
+                (get_mode(path) & 07777).should == 0666
               end
 
-              it "should set executable bits when overwriting the destination" do
+              it "should not set executable bits when overwriting the destination" do
                 FileUtils.touch(path)
 
-                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow, :backup => false)
+                catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0666, :links => :follow)
                 catalog.apply
 
-                File.should be_directory(path)
-                (get_mode(path) & 07777).should == 0777
+                (get_mode(path) & 07777).should == 0666
               end
             end
           end
 
           describe "to a file" do
-            let(:link_target) { tmpfile('file_target') }
-
-            before :each do
-              FileUtils.touch(link_target)
-
-              File.symlink(link_target, link)
-            end
+            let(:target) { tmpfile('file_target') }
 
             it "should create the file, not a symlink (#2817, #10315)" do
+              pending "bug #2817, #10315"
+
               catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0600, :links => :follow)
               catalog.apply
 
               File.should be_file(path)
-              (get_mode(path) & 07777).should == 0600
+              (get_mode(path) & 07777) == 0600
             end
 
             it "should overwrite the file" do
@@ -344,7 +343,7 @@ describe Puppet::Type.type(:file) do
               catalog.apply
 
               File.should be_file(path)
-              (get_mode(path) & 07777).should == 0600
+              (get_mode(path) & 07777) == 0600
             end
           end
 
@@ -366,11 +365,13 @@ describe Puppet::Type.type(:file) do
 
             describe "when following all links" do
               it "should create the destination and apply executable bits (#10315)" do
+                pending "bug #10315"
+
                 catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0600, :links => :follow)
                 catalog.apply
 
                 File.should be_directory(path)
-                (get_mode(path) & 07777).should == 0700
+                (get_mode(path) & 07777) == 0777
               end
 
               it "should overwrite the destination and apply executable bits" do
@@ -380,7 +381,7 @@ describe Puppet::Type.type(:file) do
                 catalog.apply
 
                 File.should be_directory(path)
-                (get_mode(path) & 0111).should == 0100
+                (get_mode(path) & 07777) == 0777
               end
             end
           end
@@ -494,6 +495,20 @@ describe Puppet::Type.type(:file) do
       bucket.bucket.getfile(foomd5).should == "fooyay"
       bucket.bucket.getfile(barmd5).should == "baryay"
     end
+
+    it "should propagate failures encountered when renaming the temporary file" do
+      file = described_class.new :path => path, :content => "foo"
+      file.stubs(:perform_backup).returns(true)
+
+      catalog.add_resource file
+
+      File.open(path, "w") { |f| f.print "bar" }
+
+      File.expects(:rename).raises ArgumentError
+
+      expect { file.write(:content) }.to raise_error(Puppet::Error, /Could not rename temporary file/)
+      File.read(path).should == "bar"
+    end
   end
 
   describe "when recursing" do
@@ -658,7 +673,7 @@ describe Puppet::Type.type(:file) do
             FileUtils.mkdir_p(File.join(two, 'three'))
             FileUtils.touch(File.join(two, 'three', 'four'))
 
-            obj = Puppet::Type.newfile(
+            catalog.add_resource Puppet::Type.newfile(
                                :path    => path,
                                :ensure  => :directory,
                                :backup  => false,
@@ -667,7 +682,6 @@ describe Puppet::Type.type(:file) do
                                :source => [one, two]
                                )
 
-            catalog.add_resource obj
             catalog.apply
 
             File.should be_directory(path)
@@ -679,12 +693,9 @@ describe Puppet::Type.type(:file) do
             one = File.expand_path('thisdoesnotexist')
             two = tmpdir('two')
             three = tmpdir('three')
+            file_in_dir_with_contents(three, 'a', '')
 
-            FileUtils.mkdir_p(two)
-            FileUtils.mkdir_p(three)
-            FileUtils.touch(File.join(three, 'a'))
-
-            obj = Puppet::Type.newfile(
+            catalog.add_resource Puppet::Type.newfile(
                                :path    => path,
                                :ensure  => :directory,
                                :backup  => false,
@@ -693,7 +704,6 @@ describe Puppet::Type.type(:file) do
                                :source => [one, two, three]
                                )
 
-            catalog.add_resource obj
             catalog.apply
 
             File.should be_directory(path)
@@ -709,7 +719,7 @@ describe Puppet::Type.type(:file) do
             FileUtils.mkdir_p(File.join(two, 'z'))
             FileUtils.touch(File.join(two, 'z', 'y'))
 
-            obj = Puppet::Type.newfile(
+            catalog.add_resource Puppet::Type.newfile(
                                :path    => path,
                                :ensure  => :directory,
                                :backup  => false,
@@ -719,7 +729,6 @@ describe Puppet::Type.type(:file) do
                                :source => [one, two]
                                )
 
-            catalog.add_resource obj
             catalog.apply
 
             File.should be_exist(File.join(path, 'a'))
@@ -731,12 +740,10 @@ describe Puppet::Type.type(:file) do
         describe "for a file" do
           it "should copy the first file that exists" do
             one = File.expand_path('thisdoesnotexist')
-            two = tmpfile('two')
-            File.open(two, "w") { |f| f.print 'yay' }
-            three = tmpfile('three')
-            File.open(three, "w") { |f| f.print 'no' }
+            two = tmpfile_with_contents('two', 'yay')
+            three = tmpfile_with_contents('three', 'no')
 
-            obj = Puppet::Type.newfile(
+            catalog.add_resource Puppet::Type.newfile(
                                :path    => path,
                                :ensure  => :file,
                                :backup  => false,
@@ -744,7 +751,6 @@ describe Puppet::Type.type(:file) do
                                :source => [one, two, three]
                                )
 
-            catalog.add_resource obj
             catalog.apply
 
             File.read(path).should == 'yay'
@@ -752,12 +758,10 @@ describe Puppet::Type.type(:file) do
 
           it "should copy an empty file" do
             one = File.expand_path('thisdoesnotexist')
-            two = tmpfile('two')
-            FileUtils.touch(two)
-            three = tmpfile('three')
-            File.open(three, "w") { |f| f.print 'no' }
+            two = tmpfile_with_contents('two', '')
+            three = tmpfile_with_contents('three', 'no')
 
-            obj = Puppet::Type.newfile(
+            catalog.add_resource Puppet::Type.newfile(
                                :path    => path,
                                :ensure  => :file,
                                :backup  => false,
@@ -765,7 +769,6 @@ describe Puppet::Type.type(:file) do
                                :source => [one, two, three]
                                )
 
-            catalog.add_resource obj
             catalog.apply
 
             File.read(path).should == ''
@@ -776,21 +779,20 @@ describe Puppet::Type.type(:file) do
       describe "when sourceselect all" do
         describe "for a directory" do
           it "should recursively copy all sources from the first valid source" do
+            dest = tmpdir('dest')
             one = tmpdir('one')
             two = tmpdir('two')
             three = tmpdir('three')
             four = tmpdir('four')
 
-            [one, two, three, four].each {|dir| FileUtils.mkdir_p(dir)}
-
-            File.open(File.join(one, 'a'), "w") { |f| f.print one }
-            File.open(File.join(two, 'a'), "w") { |f| f.print two }
-            File.open(File.join(two, 'b'), "w") { |f| f.print two }
-            File.open(File.join(three, 'a'), "w") { |f| f.print three }
-            File.open(File.join(three, 'c'), "w") { |f| f.print three }
+            file_in_dir_with_contents(one, 'a', one)
+            file_in_dir_with_contents(two, 'a', two)
+            file_in_dir_with_contents(two, 'b', two)
+            file_in_dir_with_contents(three, 'a', three)
+            file_in_dir_with_contents(three, 'c', three)
 
             obj = Puppet::Type.newfile(
-                               :path    => path,
+                               :path    => dest,
                                :ensure  => :directory,
                                :backup  => false,
                                :recurse => true,
@@ -801,9 +803,9 @@ describe Puppet::Type.type(:file) do
             catalog.add_resource obj
             catalog.apply
 
-            File.read(File.join(path, 'a')).should == one
-            File.read(File.join(path, 'b')).should == two
-            File.read(File.join(path, 'c')).should == three
+            File.read(File.join(dest, 'a')).should == one
+            File.read(File.join(dest, 'b')).should == two
+            File.read(File.join(dest, 'c')).should == three
           end
 
           it "should only recurse one level from each valid source" do
@@ -840,15 +842,10 @@ describe Puppet::Type.type(:file) do
 
   describe "when generating resources" do
     before do
-      source = tmpfile("generating_in_catalog_source")
-
-      Dir.mkdir(source)
-
-      s1 = File.join(source, "one")
-      s2 = File.join(source, "two")
+      source = tmpdir("generating_in_catalog_source")
 
-      File.open(s1, "w") { |f| f.puts "uno" }
-      File.open(s2, "w") { |f| f.puts "dos" }
+      s1 = file_in_dir_with_contents(source, "one", "uno")
+      s2 = file_in_dir_with_contents(source, "two", "dos")
 
       @file = described_class.new(
         :name => path,
@@ -879,17 +876,10 @@ describe Puppet::Type.type(:file) do
   end
 
   describe "when copying files" do
-    # Ticket #285.
-    it "should be able to copy files with pound signs in their names" do
-      source = tmpfile("filewith#signs")
-
+    it "should be able to copy files with pound signs in their names (#285)" do
+      source = tmpfile_with_contents("filewith#signs", "foo")
       dest = tmpfile("destwith#signs")
-
-      File.open(source, "w") { |f| f.print "foo" }
-
-      file = described_class.new(:name => dest, :source => source)
-
-      catalog.add_resource file
+      catalog.add_resource described_class.new(:name => dest, :source => source)
 
       catalog.apply
 
@@ -897,16 +887,11 @@ describe Puppet::Type.type(:file) do
     end
 
     it "should be able to copy files with spaces in their names" do
-      source = tmpfile("filewith spaces")
-
       dest = tmpfile("destwith spaces")
-
-      File.open(source, "w") { |f| f.print "foo" }
+      source = tmpfile_with_contents("filewith spaces", "foo")
       File.chmod(0755, source)
 
-      file = described_class.new(:path => dest, :source => source)
-
-      catalog.add_resource file
+      catalog.add_resource described_class.new(:path => dest, :source => source)
 
       catalog.apply
 
@@ -916,14 +901,10 @@ describe Puppet::Type.type(:file) do
     end
 
     it "should be able to copy individual files even if recurse has been specified" do
-      source = tmpfile("source")
+      source = tmpfile_with_contents("source", "foo")
       dest = tmpfile("dest")
+      catalog.add_resource described_class.new(:name => dest, :source => source, :recurse => true)
 
-      File.open(source, "w") { |f| f.print "foo" }
-
-      file = described_class.new(:name => dest, :source => source, :recurse => true)
-
-      catalog.add_resource file
       catalog.apply
 
       File.read(dest).should == "foo"
@@ -931,12 +912,11 @@ describe Puppet::Type.type(:file) do
   end
 
   it "should create a file with content if ensure is omitted" do
-    file = described_class.new(
+    catalog.add_resource described_class.new(
       :path => path,
       :content => "this is some content, yo"
     )
 
-    catalog.add_resource file
     catalog.apply
 
     File.read(path).should == "this is some content, yo"
@@ -956,14 +936,11 @@ describe Puppet::Type.type(:file) do
   end
 
   it "should delete files with sources but that are set for deletion" do
-    source = tmpfile("source_source_with_ensure")
-
-    File.open(source, "w") { |f| f.puts "yay" }
-    File.open(path, "w") { |f| f.puts "boo" }
-
+    source = tmpfile_with_contents("source_source_with_ensure", "yay")
+    dest = tmpfile_with_contents("source_source_with_ensure", "boo")
 
     file = described_class.new(
-      :path   => path,
+      :path   => dest,
       :ensure => :absent,
       :source => source,
       :backup => false
@@ -972,15 +949,11 @@ describe Puppet::Type.type(:file) do
     catalog.add_resource file
     catalog.apply
 
-    File.should_not be_exist(path)
+    File.should_not be_exist(dest)
   end
 
   describe "when sourcing" do
-    let(:source) {
-      source = tmpfile("source_default_values")
-      File.open(source, "w") { |f| f.puts "yay" }
-      source
-    }
+    let(:source) { tmpfile_with_contents("source_default_values", "yay") }
 
     it "should apply the source metadata values" do
       set_mode(0770, source)
@@ -1020,7 +993,6 @@ describe Puppet::Type.type(:file) do
     describe "on Windows systems", :if => Puppet.features.microsoft_windows? do
       it "should provide valid default values when ACLs are not supported" do
         Puppet::Util::Windows::Security.stubs(:supports_acl?).with(source).returns false
-        Puppet::Util::Windows::Security.stubs(:supports_acl?).with(path).returns true
 
         file = described_class.new(
           :path   => path,
@@ -1041,10 +1013,8 @@ describe Puppet::Type.type(:file) do
 
   describe "when purging files" do
     before do
-      sourcedir = tmpfile("purge_source")
-      destdir = tmpfile("purge_dest")
-      Dir.mkdir(sourcedir)
-      Dir.mkdir(destdir)
+      sourcedir = tmpdir("purge_source")
+      destdir = tmpdir("purge_dest")
       sourcefile = File.join(sourcedir, "sourcefile")
 
       @copiedfile = File.join(destdir, "sourcefile")
@@ -1089,4 +1059,16 @@ describe Puppet::Type.type(:file) do
       FileTest.should_not be_exist(@purgee)
     end
   end
+
+  def tmpfile_with_contents(name, contents)
+    file = tmpfile(name)
+    File.open(file, "w") { |f| f.write contents }
+    file
+  end
+
+  def file_in_dir_with_contents(dir, name, contents)
+    full_name = File.join(dir, name)
+    File.open(full_name, "w") { |f| f.write contents }
+    full_name
+  end
 end