diff options
author | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-02 11:57:38 -0700 |
---|---|---|
committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:58 -0700 |
commit | 58c7dacef62679c9e2ec5fd889d224978ed8c0d6 (patch) | |
tree | 688ee9612a424b72418254c2e4e46ced62f81de7 /spec | |
parent | 9f2a7b90095126864a329c3f729a820f47522194 (diff) | |
download | puppet-58c7dacef62679c9e2ec5fd889d224978ed8c0d6.tar.gz puppet-58c7dacef62679c9e2ec5fd889d224978ed8c0d6.tar.xz puppet-58c7dacef62679c9e2ec5fd889d224978ed8c0d6.zip |
Remove :fails_on_windows from file type tests that no longer fail on Windows
With the previous changes to the file bucket and the handling of what
is considered an absolute path, enough pieces have slid into place
that the file type is now mostly working on Windows.
Reviewed-by: Nick Lewis <nick@puppetlabs.com>
(cherry picked from commit 6385e08004ff06b709cc874870de38c078adb791)
Diffstat (limited to 'spec')
-rwxr-xr-x | spec/integration/type/file_spec.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/spec/integration/type/file_spec.rb b/spec/integration/type/file_spec.rb index 7d6bceb18..c900b46b7 100755 --- a/spec/integration/type/file_spec.rb +++ b/spec/integration/type/file_spec.rb @@ -349,7 +349,7 @@ describe Puppet::Type.type(:file) do describe "when copying files" do # Ticket #285. - it "should be able to copy files with pound signs in their names", :fails_on_windows => true do + it "should be able to copy files with pound signs in their names" do source = tmpfile("filewith#signs") dest = tmpfile("destwith#signs") @@ -366,7 +366,7 @@ describe Puppet::Type.type(:file) do File.read(dest).should == "foo" end - it "should be able to copy files with spaces in their names", :fails_on_windows => true do + it "should be able to copy files with spaces in their names" do source = tmpfile("filewith spaces") dest = tmpfile("destwith spaces") @@ -385,7 +385,7 @@ describe Puppet::Type.type(:file) do (File.stat(dest).mode & 007777).should == 0755 end - it "should be able to copy individual files even if recurse has been specified", :fails_on_windows => true do + it "should be able to copy individual files even if recurse has been specified" do source = tmpfile("source") dest = tmpfile("dest") @@ -434,7 +434,7 @@ describe Puppet::Type.type(:file) do File.read(dest).should == "this is some content, yo" end - it "should delete files with sources but that are set for deletion", :fails_on_windows => true do + it "should delete files with sources but that are set for deletion" do dest = tmpfile("dest_source_with_ensure") source = tmpfile("source_source_with_ensure") File.open(source, "w") { |f| f.puts "yay" } @@ -455,7 +455,7 @@ describe Puppet::Type.type(:file) do File.should_not be_exist(dest) end - describe "when purging files", :fails_on_windows => true do + describe "when purging files" do before do @sourcedir = tmpfile("purge_source") @destdir = tmpfile("purge_dest") @@ -470,7 +470,6 @@ describe Puppet::Type.type(:file) do # this file should get removed File.open(@purgee, "w") { |f| f.puts "footest" } - @lfobj = Puppet::Type.newfile( :title => "localfile", :path => @localfile, @@ -479,7 +478,6 @@ describe Puppet::Type.type(:file) do :backup => false ) - @destobj = Puppet::Type.newfile( :title => "destdir", :path => @destdir, |