diff options
author | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-02 11:39:02 -0700 |
---|---|---|
committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:58 -0700 |
commit | 9f2a7b90095126864a329c3f729a820f47522194 (patch) | |
tree | 52d7e78d567856e346af903717f035da3a7916a8 | |
parent | 1e59b268063772a59efdc810e5967c63e05cdb2d (diff) | |
download | puppet-9f2a7b90095126864a329c3f729a820f47522194.tar.gz puppet-9f2a7b90095126864a329c3f729a820f47522194.tar.xz puppet-9f2a7b90095126864a329c3f729a820f47522194.zip |
Disable file bucket diffing tests on Windows
The diffing ability of the file bucket is purely master functionality,
and not supported on Windows.
Reviewed-by: Nick Lewis <nick@puppetlabs.com>
(cherry picked from commit 660ea963ddc5c74a758f6d52384ea40a8d335c58)
-rwxr-xr-x | spec/unit/indirector/file_bucket_file/file_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/indirector/file_bucket_file/file_spec.rb b/spec/unit/indirector/file_bucket_file/file_spec.rb index eb86eee85..808da17d8 100755 --- a/spec/unit/indirector/file_bucket_file/file_spec.rb +++ b/spec/unit/indirector/file_bucket_file/file_spec.rb @@ -111,7 +111,7 @@ describe Puppet::FileBucketFile::File do end end - describe "when diffing files" do + describe "when diffing files", :unless => Puppet.features.microsoft_windows? do it "should generate an empty string if there is no diff" do checksum = save_bucket_file("I'm the contents of a file") Puppet::FileBucket::File.indirection.find("md5/#{checksum}", :diff_with => checksum).should == '' |