Merge branch '2.6.x' into 2.7.x

* 2.6.x:
  (maint) Cleanup and strengthen acceptance tests
  (#7144) Update Settings#writesub to convert mode to Fixnum
  (maint) Fix platform dection for RHEL

Manually Resolved Conflicts:
	acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb
	spec/unit/util/settings_spec.rb

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/unit/util/settings_spec.rb b/spec/unit/util/settings_spec.rb
index aa50c8f3a..a2cd57a0c 100755
--- a/spec/unit/util/settings_spec.rb
+++ b/spec/unit/util/settings_spec.rb
@@ -1,5 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
+require 'ostruct'
 
 describe Puppet::Util::Settings do
   describe "when specifying defaults" do
@@ -1104,4 +1105,14 @@ describe Puppet::Util::Settings do
 
     it "should cache the result"
   end
+
+  describe "#writesub" do
+    it "should only pass valid arguments to File.open" do
+      settings = Puppet::Util::Settings.new
+      settings.stubs(:get_config_file_default).with(:privatekeydir).returns(OpenStruct.new(:mode => "750"))
+
+      File.expects(:open).with("/path/to/keydir", "w", 750).returns true
+      settings.writesub(:privatekeydir, "/path/to/keydir")
+    end
+  end
 end