puppet 2.7.6 → 2.7.8

data/spec/integration/util_spec.rb

@@ -9,5 +9,21 @@ describe Puppet::Util do
 
       Puppet::Util.execute(command, :combine => true).split.should =~ [*'1'..'10']
     end
+
+    it "should return output and set $CHILD_STATUS" do
+      command = "ruby -e 'puts \"foo\"; exit 42'"
+
+      output = Puppet::Util.execute(command, {:failonfail => false})
+
+      output.should == "foo\n"
+      $CHILD_STATUS.exitstatus.should == 42
+    end
+
+    it "should raise an error if non-zero exit status is returned" do
+      command = "ruby -e 'exit 43'"
+
+      expect { Puppet::Util.execute(command) }.to raise_error(Puppet::ExecutionFailure, /Execution of '#{command}' returned 43: /)
+      $CHILD_STATUS.exitstatus.should == 43
+    end
   end
 end

data/spec/lib/puppet_spec/files.rb

@@ -30,13 +30,9 @@ module PuppetSpec::Files
   end
 
   def make_absolute(path)
-    return path unless Puppet.features.microsoft_windows?
-    # REMIND UNC
-    return path if path =~ /^[A-Za-z]:/
-
-    pwd = Dir.getwd
-    return "#{pwd[0,2]}#{path}" if pwd =~ /^[A-Za-z]:/
-    return "C:#{path}"
+    path = File.expand_path(path)
+    path[0] = 'c' if Puppet.features.microsoft_windows?
+    path
   end
 
   def tmpfile(name)

data/spec/unit/application/apply_spec.rb

@@ -66,15 +66,6 @@ describe Puppet::Application::Apply do
       @apply.options.stubs(:[]).with(any_parameters)
     end
 
-    it "should set show_diff on --noop" do
-      Puppet[:noop] = true
-      Puppet[:show_diff] = false
-
-      @apply.setup
-
-      Puppet[:show_diff].should == true
-    end
-
     it "should set console as the log destination if logdest option wasn't provided" do
       Puppet::Log.expects(:newdestination).with(:console)
 

data/spec/unit/application/inspect_spec.rb

@@ -57,6 +57,7 @@ describe Puppet::Application::Inspect do
     it "should audit the specified properties" do
       catalog = Puppet::Resource::Catalog.new
       file = Tempfile.new("foo")
+      file.binmode
       file.puts("file contents")
       file.close
       resource = Puppet::Resource.new(:file, file.path, :parameters => {:audit => "all"})

data/spec/unit/configurer/downloader_spec.rb

@@ -97,8 +97,8 @@ describe Puppet::Configurer::Downloader do
 
   describe "when creating the catalog to do the downloading" do
     before do
-      @path = File.expand_path("/download/path")
-      @dler = Puppet::Configurer::Downloader.new("foo", @path, File.expand_path("source"))
+      @path = make_absolute("/download/path")
+      @dler = Puppet::Configurer::Downloader.new("foo", @path, make_absolute("source"))
     end
 
     it "should create a catalog and add the file to it" do
@@ -122,7 +122,7 @@ describe Puppet::Configurer::Downloader do
       @dler = Puppet::Configurer::Downloader.new("foo", @dl_name, source_name)
     end
 
-    it "should not skip downloaded resources when filtering on tags", :fails_on_windows => true do
+    it "should not skip downloaded resources when filtering on tags" do
       Puppet[:tags] = 'maytag'
       @dler.evaluate
 

data/spec/unit/face/certificate_spec.rb

@@ -57,6 +57,10 @@ describe Puppet::Face[:certificate, '0.0.1'] do
     let(:host) { Puppet::SSL::Host.new(hostname) }
     let(:csr) { host.certificate_request }
 
+    before :each do
+      Puppet[:autosign] = false
+    end
+
     describe "for the current host" do
       let(:hostname) { Puppet[:certname] }
 
@@ -131,7 +135,7 @@ describe Puppet::Face[:certificate, '0.0.1'] do
     let(:host) { Puppet::SSL::Host.new(hostname) }
     let(:hostname) { "foobar" }
 
-    it "should sign the certificate request if one is waiting" do
+    it "should sign the certificate request if one is waiting", :unless => Puppet.features.microsoft_windows? do
       subject.generate(hostname, options)
 
       subject.sign(hostname, options)
@@ -147,7 +151,7 @@ describe Puppet::Face[:certificate, '0.0.1'] do
       end.to raise_error(ArgumentError, /Could not find certificate request for #{hostname}/)
     end
 
-    describe "when ca_location is local" do
+    describe "when ca_location is local", :unless => Puppet.features.microsoft_windows? do
       describe "when the request has dns alt names" do
         before :each do
           subject.generate(hostname, options.merge(:dns_alt_names => 'some,alt,names'))

data/spec/unit/file_bucket/dipper_spec.rb

@@ -11,7 +11,7 @@ describe Puppet::FileBucket::Dipper do
 
   def make_tmp_file(contents)
     file = tmpfile("file_bucket_file")
-    File.open(file, 'w') { |f| f.write(contents) }
+    File.open(file, 'wb') { |f| f.write(contents) }
     file
   end
 
@@ -34,25 +34,25 @@ describe Puppet::FileBucket::Dipper do
     lambda { @dipper.backup(file) }.should raise_error(Puppet::Error)
   end
 
-  it "should backup files to a local bucket", :fails_on_windows => true do
+  it "should backup files to a local bucket" do
     Puppet[:bucketdir] = "/non/existent/directory"
     file_bucket = tmpdir("bucket")
 
     @dipper = Puppet::FileBucket::Dipper.new(:Path => file_bucket)
 
-    file = make_tmp_file('my contents')
-    checksum = "2975f560750e71c478b8e3b39a956adb"
-    Digest::MD5.hexdigest('my contents').should == checksum
+    file = make_tmp_file("my\r\ncontents")
+    checksum = "f0d7d4e480ad698ed56aeec8b6bd6dea"
+    Digest::MD5.hexdigest("my\r\ncontents").should == checksum
 
     @dipper.backup(file).should == checksum
-    File.exists?("#{file_bucket}/2/9/7/5/f/5/6/0/2975f560750e71c478b8e3b39a956adb/contents").should == true
+    File.exists?("#{file_bucket}/f/0/d/7/d/4/e/4/f0d7d4e480ad698ed56aeec8b6bd6dea/contents").should == true
   end
 
   it "should not backup a file that is already in the bucket" do
     @dipper = Puppet::FileBucket::Dipper.new(:Path => "/my/bucket")
 
-    file = make_tmp_file('my contents')
-    checksum = Digest::MD5.hexdigest('my contents')
+    file = make_tmp_file("my\r\ncontents")
+    checksum = Digest::MD5.hexdigest("my\r\ncontents")
 
     Puppet::FileBucket::File.indirection.expects(:head).returns true
     Puppet::FileBucket::File.indirection.expects(:save).never
@@ -76,8 +76,8 @@ describe Puppet::FileBucket::Dipper do
   it "should backup files to a remote server" do
     @dipper = Puppet::FileBucket::Dipper.new(:Server => "puppetmaster", :Port => "31337")
 
-    file = make_tmp_file('my contents')
-    checksum = Digest::MD5.hexdigest('my contents')
+    file = make_tmp_file("my\r\ncontents")
+    checksum = Digest::MD5.hexdigest("my\r\ncontents")
 
     real_path = Pathname.new(file).realpath
 
@@ -110,4 +110,61 @@ describe Puppet::FileBucket::Dipper do
     request.port.should == 31337
     request.key.should == "md5/#{checksum}"
   end
+
+  describe "#restore" do
+    shared_examples_for "a restorable file" do
+      let(:contents) { "my\ncontents" }
+      let(:md5) { Digest::MD5.hexdigest(contents) }
+      let(:dest) { tmpfile('file_bucket_dest') }
+
+      it "should restore the file" do
+        request = nil
+
+        klass.any_instance.expects(:find).with { |r| request = r }.returns(Puppet::FileBucket::File.new(contents))
+
+        dipper.restore(dest, md5).should == md5
+        Digest::MD5.file(dest).hexdigest.should == md5
+
+        request.key.should == "md5/#{md5}"
+        request.server.should == server
+        request.port.should == port
+      end
+
+      it "should skip restoring if existing file has the same checksum" do
+        crnl = "my\r\ncontents"
+        File.open(dest, 'wb') {|f| f.print(crnl) }
+
+        dipper.expects(:getfile).never
+        dipper.restore(dest, Digest::MD5.hexdigest(crnl)).should be_nil
+      end
+
+      it "should overwrite existing file if it has different checksum" do
+        klass.any_instance.expects(:find).returns(Puppet::FileBucket::File.new(contents))
+
+        File.open(dest, 'wb') {|f| f.print('other contents') }
+
+        dipper.restore(dest, md5).should == md5
+      end
+    end
+
+    describe "when restoring from a remote server" do
+      let(:klass) { Puppet::FileBucketFile::Rest }
+      let(:server) { "puppetmaster" }
+      let(:port) { 31337 }
+
+      it_behaves_like "a restorable file" do
+        let (:dipper) { Puppet::FileBucket::Dipper.new(:Server => server, :Port => port.to_s) }
+      end
+    end
+
+    describe "when restoring from a local server" do
+      let(:klass) { Puppet::FileBucketFile::File }
+      let(:server) { nil }
+      let(:port) { nil }
+
+      it_behaves_like "a restorable file" do
+        let (:dipper) { Puppet::FileBucket::Dipper.new(:Path => "/my/bucket") }
+      end
+    end
+  end
 end

data/spec/unit/file_bucket/file_spec.rb

@@ -8,20 +8,15 @@ require 'digest/sha1'
 describe Puppet::FileBucket::File do
   include PuppetSpec::Files
 
-  before do
-    # this is the default from spec_helper, but it keeps getting reset at odd times
-    @bucketdir = tmpdir('bucket')
-    Puppet[:bucketdir] = @bucketdir
-
-    @digest = "4a8ec4fa5f01b4ab1a0ab8cbccb709f0"
-    @checksum = "{md5}4a8ec4fa5f01b4ab1a0ab8cbccb709f0"
-    @dir = File.join(@bucketdir, '4/a/8/e/c/4/f/a/4a8ec4fa5f01b4ab1a0ab8cbccb709f0')
-
-    @contents = "file contents"
-  end
+  let(:contents) { "file\r\n contents" }
+  let(:digest) { "8b3702ad1aed1ace7e32bde76ffffb2d" }
+  let(:checksum) { "{md5}#{digest}" }
+  # this is the default from spec_helper, but it keeps getting reset at odd times
+  let(:bucketdir) { Puppet[:bucketdir] = tmpdir('bucket') }
+  let(:destdir) { File.join(bucketdir, "8/b/3/7/0/2/a/d/#{digest}") }
 
   it "should have a to_s method to return the contents" do
-    Puppet::FileBucket::File.new(@contents).to_s.should == @contents
+    Puppet::FileBucket::File.new(contents).to_s.should == contents
   end
 
   it "should raise an error if changing content" do
@@ -40,15 +35,15 @@ describe Puppet::FileBucket::File do
   end
 
   it "should set the contents appropriately" do
-    Puppet::FileBucket::File.new(@contents).contents.should == @contents
+    Puppet::FileBucket::File.new(contents).contents.should == contents
   end
 
   it "should default to 'md5' as the checksum algorithm if the algorithm is not in the name" do
-    Puppet::FileBucket::File.new(@contents).checksum_type.should == "md5"
+    Puppet::FileBucket::File.new(contents).checksum_type.should == "md5"
   end
 
   it "should calculate the checksum" do
-    Puppet::FileBucket::File.new(@contents).checksum.should == @checksum
+    Puppet::FileBucket::File.new(contents).checksum.should == checksum
   end
 
   describe "when using back-ends" do
@@ -62,16 +57,16 @@ describe Puppet::FileBucket::File do
   end
 
   it "should return a url-ish name" do
-    Puppet::FileBucket::File.new(@contents).name.should == "md5/4a8ec4fa5f01b4ab1a0ab8cbccb709f0"
+    Puppet::FileBucket::File.new(contents).name.should == "md5/#{digest}"
   end
 
   it "should reject a url-ish name with an invalid checksum" do
-    bucket = Puppet::FileBucket::File.new(@contents)
-    expect { bucket.name = "sha1/4a8ec4fa5f01b4ab1a0ab8cbccb709f0/new/path" }.to raise_error(NoMethodError, /undefined method .name=/)
+    bucket = Puppet::FileBucket::File.new(contents)
+    expect { bucket.name = "sha1/ae548c0cd614fb7885aaa0b6cb191c34/new/path" }.to raise_error(NoMethodError, /undefined method .name=/)
   end
 
   it "should convert the contents to PSON" do
-    Puppet::FileBucket::File.new(@contents).to_pson.should == '{"contents":"file contents"}'
+    Puppet::FileBucket::File.new("file contents").to_pson.should == '{"contents":"file contents"}'
   end
 
   it "should load from PSON" do
@@ -79,34 +74,33 @@ describe Puppet::FileBucket::File do
   end
 
   def make_bucketed_file
-    FileUtils.mkdir_p(@dir)
-    File.open("#{@dir}/contents", 'w') { |f| f.write @contents }
+    FileUtils.mkdir_p(destdir)
+    File.open("#{destdir}/contents", 'wb') { |f| f.write contents }
   end
 
   describe "using the indirector's find method" do
     it "should return nil if a file doesn't exist" do
-      bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{@digest}")
+      bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{digest}")
       bucketfile.should == nil
     end
 
     it "should find a filebucket if the file exists" do
       make_bucketed_file
-      bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{@digest}")
-      bucketfile.should_not == nil
+      bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{digest}")
+      bucketfile.checksum.should == checksum
     end
 
     describe "using RESTish digest notation" do
       it "should return nil if a file doesn't exist" do
-        bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{@digest}")
+        bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{digest}")
         bucketfile.should == nil
       end
 
       it "should find a filebucket if the file exists" do
         make_bucketed_file
-        bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{@digest}")
-        bucketfile.should_not == nil
+        bucketfile = Puppet::FileBucket::File.indirection.find("md5/#{digest}")
+        bucketfile.checksum.should == checksum
       end
-
     end
   end
 end

data/spec/unit/file_serving/content_spec.rb

@@ -73,7 +73,7 @@ describe Puppet::FileServing::Content do
   it "should return an opened File when converted to raw" do
     content = Puppet::FileServing::Content.new("/path")
 
-    File.expects(:new).with("/path","r").returns :file
+    File.expects(:new).with("/path","rb").returns :file
 
     content.to_raw.should == :file
   end

data/spec/unit/file_serving/metadata_spec.rb

@@ -139,7 +139,7 @@ describe Puppet::FileServing::Metadata do
           let(:checksum) { Digest::MD5.hexdigest("some content\n") }
 
           before :each do
-            File.open(path, "w") {|f| f.print("some content\n")}
+            File.open(path, "wb") {|f| f.print("some content\n")}
           end
 
           it "should default to a checksum of type MD5 with the file's current checksum" do
@@ -198,7 +198,7 @@ describe Puppet::FileServing::Metadata do
         let(:fmode) { File.lstat(path).mode & 0777 }
 
         before :each do
-          File.open(target, "w") {|f| f.print("some content\n")}
+          File.open(target, "wb") {|f| f.print("some content\n")}
           set_mode(0644, target)
 
           FileUtils.symlink(target, path)
@@ -223,7 +223,7 @@ describe Puppet::FileServing::Metadata do
       let(:path) { tmpfile('file_serving_metadata_find_file') }
 
       before :each do
-        File.open(path, "w") {|f| f.print("some content\n")}
+        File.open(path, "wb") {|f| f.print("some content\n")}
         set_mode(0755, path)
       end
 
@@ -277,6 +277,33 @@ describe Puppet::FileServing::Metadata do
 
     it_should_behave_like "metadata collector"
 
+    describe "if ACL metadata cannot be collected" do
+      let(:path) { tmpdir('file_serving_metadata_acl') }
+      let(:metadata) do
+        data = described_class.new(path)
+        data.collect
+        data
+      end
+
+      it "should default owner" do
+        Puppet::Util::Windows::Security.stubs(:get_owner).returns nil
+
+        metadata.owner.should == 'S-1-5-32-544'
+      end
+
+      it "should default group" do
+        Puppet::Util::Windows::Security.stubs(:get_group).returns nil
+
+        metadata.group.should == 'S-1-0-0'
+      end
+
+      it "should default mode" do
+        Puppet::Util::Windows::Security.stubs(:get_mode).returns nil
+
+        metadata.mode.should == 0644
+      end
+    end
+
     def set_mode(mode, path)
       Puppet::Util::Windows::Security.set_mode(mode, path)
     end

data/spec/unit/indirector/facts/inventory_service_spec.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+require 'puppet/indirector/facts/inventory_service'
+
+describe Puppet::Node::Facts::InventoryService do
+  it "should suppress failures and warn when saving facts" do
+    facts = Puppet::Node::Facts.new('foo')
+    request = Puppet::Indirector::Request.new(:facts, :save, facts)
+
+    Net::HTTP.any_instance.stubs(:put).raises(Errno::ECONNREFUSED)
+
+    Puppet.expects(:warning).with do |msg|
+      msg =~ /Could not upload facts for foo to inventory service/
+    end
+
+    expect {
+      subject.save(request)
+    }.should_not raise_error
+  end
+end
+

data/spec/unit/indirector/file_bucket_file/file_spec.rb

@@ -30,9 +30,9 @@ describe Puppet::FileBucketFile::File do
     describe "when servicing a save request" do
       describe "when supplying a path" do
         it "should store the path if not already stored" do
-          checksum = save_bucket_file("stuff", "/foo/bar")
-          dir_path = "#{Puppet[:bucketdir]}/c/1/3/d/8/8/c/b/c13d88cb4cb02003daedb8a84e5d272a"
-          File.read("#{dir_path}/contents").should == "stuff"
+          checksum = save_bucket_file("stuff\r\n", "/foo/bar")
+          dir_path = "#{Puppet[:bucketdir]}/f/c/7/7/7/c/0/b/fc777c0bc467e1ab98b4c6915af802ec"
+          Puppet::Util.binread("#{dir_path}/contents").should == "stuff\r\n"
           File.read("#{dir_path}/paths").should == "foo/bar\n"
         end
 
@@ -241,33 +241,30 @@ HERE
   end
 
   describe "when verifying identical files" do
-    before do
-      # this is the default from spec_helper, but it keeps getting reset at odd times
-      Puppet[:bucketdir] = make_absolute("/dev/null/bucket")
-
-      @digest = "4a8ec4fa5f01b4ab1a0ab8cbccb709f0"
-      @checksum = "{md5}4a8ec4fa5f01b4ab1a0ab8cbccb709f0"
-      @dir = make_absolute('/dev/null/bucket/4/a/8/e/c/4/f/a/4a8ec4fa5f01b4ab1a0ab8cbccb709f0')
-
-      @contents = "file contents"
-
-      @bucket = stub "bucket file"
-      @bucket.stubs(:bucket_path)
-      @bucket.stubs(:checksum).returns(@checksum)
-      @bucket.stubs(:checksum_data).returns(@digest)
-      @bucket.stubs(:path).returns(nil)
-      @bucket.stubs(:contents).returns("file contents")
+    let(:contents) { "file\r\n contents" }
+    let(:digest) { "8b3702ad1aed1ace7e32bde76ffffb2d" }
+    let(:checksum) { "{md5}#{@digest}" }
+    let(:bucketdir) { tmpdir('file_bucket_file') }
+    let(:destdir) { "#{bucketdir}/8/b/3/7/0/2/a/d/8b3702ad1aed1ace7e32bde76ffffb2d" }
+    let(:bucket) { Puppet::FileBucket::File.new(contents) }
+
+    before :each do
+      Puppet[:bucketdir] = bucketdir
+      FileUtils.mkdir_p(destdir)
     end
 
     it "should raise an error if the files don't match" do
-      File.expects(:read).with("#{@dir}/contents").returns("corrupt contents")
-      lambda{ Puppet::FileBucketFile::File.new.send(:verify_identical_file!, @bucket) }.should raise_error(Puppet::FileBucket::BucketError)
+      File.open(File.join(destdir, 'contents'), 'wb') { |f| f.print "corrupt contents" }
+
+      lambda{
+        Puppet::FileBucketFile::File.new.send(:verify_identical_file!, bucket)
+      }.should raise_error(Puppet::FileBucket::BucketError)
     end
 
     it "should do nothing if the files match" do
-      File.expects(:read).with("#{@dir}/contents").returns("file contents")
-      Puppet::FileBucketFile::File.new.send(:verify_identical_file!, @bucket)
-    end
+      File.open(File.join(destdir, 'contents'), 'wb') { |f| f.print contents }
 
+      Puppet::FileBucketFile::File.new.send(:verify_identical_file!, bucket)
+    end
   end
 end