puppet 4.4.1-universal-darwin → 4.4.2-universal-darwin

data/spec/unit/util/monkey_patches_spec.rb

@@ -5,6 +5,10 @@ require 'puppet/util/monkey_patches'
 
 
 describe Symbol do
+  after :all do
+    $unique_warnings.delete('symbol_comparison') if $unique_warnings
+  end
+
   it "should return self from #intern" do
     symbol = :foo
     expect(symbol).to equal symbol.intern
@@ -173,8 +177,9 @@ end
 
 
 describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
-  let(:store) { described_class.new }
-  let(:cert)  { OpenSSL::X509::Certificate.new(File.read(my_fixture('x509.pem'))) }
+  let(:store)    { described_class.new }
+  let(:cert)     { OpenSSL::X509::Certificate.new(File.read(my_fixture('x509.pem'))) }
+  let(:samecert) { cert.dup() }
 
   def with_root_certs(certs)
     Puppet::Util::Windows::RootCerts.expects(:instance).returns(certs)
@@ -186,10 +191,21 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
     store.set_default_paths
   end
 
+  it "doesn't warn when calling set_default_paths multiple times" do
+    with_root_certs([cert])
+    store.expects(:warn).never
+
+    store.set_default_paths
+    store.set_default_paths
+  end
+
   it "ignores duplicate root certs" do
-    with_root_certs([cert, cert])
+    # prove that even though certs have identical contents, their hashes differ
+    expect(cert.hash).to_not eq(samecert.hash)
+    with_root_certs([cert, samecert])
 
     store.expects(:add_cert).with(cert).once
+    store.expects(:add_cert).with(samecert).never
 
     store.set_default_paths
   end

data/spec/unit/util/windows/file_spec.rb

@@ -0,0 +1,34 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/util/windows'
+
+describe Puppet::Util::Windows::File, :if => Puppet::Util::Platform.windows? do
+  include PuppetSpec::Files
+
+  let(:nonexist_file) { 'C:\somefile\that\wont\ever\exist' }
+  let(:invalid_file_attributes) { 0xFFFFFFFF } #define INVALID_FILE_ATTRIBUTES (DWORD (-1))
+
+  describe "get_attributes" do
+    it "should raise an error for files that do not exist by default" do
+      expect {
+        described_class.get_attributes(nonexist_file)
+      }.to raise_error(Puppet::Error, /GetFileAttributes/)
+    end
+
+    it "should raise an error for files that do not exist when specified" do
+      expect {
+        described_class.get_attributes(nonexist_file, true)
+      }.to raise_error(Puppet::Error, /GetFileAttributes/)
+    end
+
+    it "should not raise an error for files that do not exist when specified" do
+      expect {
+        described_class.get_attributes(nonexist_file, false)
+      }.not_to raise_error
+    end
+
+    it "should return INVALID_FILE_ATTRIBUTES for files that do not exist when specified" do
+      expect(described_class.get_attributes(nonexist_file, false)).to eq(invalid_file_attributes)
+    end
+  end
+end