diff options
| author | Rick Bradley <rick@rickbradley.com> | 2008-02-18 10:43:40 -0600 |
|---|---|---|
| committer | Rick Bradley <rick@rickbradley.com> | 2008-02-18 10:43:40 -0600 |
| commit | cfbb9cf7b44cb48433b118108e36660e3e6815bb (patch) | |
| tree | bdfd06a7fc9d405a26e3c81345fe4fda413c6553 | |
| parent | f9f32c432f266c77932fa8168c76d7780064c186 (diff) | |
| parent | d11cd39024e1baa5988e587e34fad65bb116ea01 (diff) | |
| download | puppet-cfbb9cf7b44cb48433b118108e36660e3e6815bb.tar.gz puppet-cfbb9cf7b44cb48433b118108e36660e3e6815bb.tar.xz puppet-cfbb9cf7b44cb48433b118108e36660e3e6815bb.zip | |
Merge branch '0.24.x' into my24
| -rwxr-xr-x | spec/unit/file_serving/metadata.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/unit/file_serving/metadata.rb b/spec/unit/file_serving/metadata.rb index f7ab0c8d6..d31dd21f0 100755 --- a/spec/unit/file_serving/metadata.rb +++ b/spec/unit/file_serving/metadata.rb @@ -58,10 +58,11 @@ describe Puppet::FileServing::Metadata, " when collecting attributes" do @stat = stub 'stat', :uid => 10, :gid => 20, :mode => 0755, :ftype => "file" File.stubs(:lstat).returns(@stat) @filehandle = mock 'filehandle' - @filehandle.expects(:each_line).yields("some content\n") + #@filehandle.expects(:read).with(512).returns("some content\n").then.returns(nil) File.stubs(:open).with(@path, 'r').yields(@filehandle) @checksum = Digest::MD5.hexdigest("some content\n") @metadata = Puppet::FileServing::Metadata.new("file", :path => "/my/file") + @metadata.expects(:md5_file).returns(@checksum) @metadata.collect_attributes end |