When running as root, the default conf and var directories on Windows
are currently puppet/etc and puppet/var within the windows
directory. Updated the spec tests to match what the code does on
Windows.
Whether or not this is the correct behavior is something that will be
addressed in the future. See #8660.
Reviewed-by: Jacob Helwig <ja...@puppetlabs.com>
Signed-off-by: Josh Cooper <j...@puppetlabs.com>
---
Local-branch: ticket/master/8663-windows-spec-tests
spec/unit/util/run_mode_spec.rb | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/spec/unit/util/run_mode_spec.rb b/spec/unit/util/run_mode_spec.rb
index 883ee12..5d9a3d0 100755
--- a/spec/unit/util/run_mode_spec.rb
+++ b/spec/unit/util/run_mode_spec.rb
@@ -1,14 +1,16 @@
#!/usr/bin/env rspec
require 'spec_helper'
-describe Puppet::Util::RunMode, :fails_on_windows => true do
+describe Puppet::Util::RunMode do
before do
@run_mode = Puppet::Util::RunMode.new('fake')
end
it "should have confdir /etc/puppet when run as root" do
Puppet.features.stubs(:root?).returns(true)
- @run_mode.conf_dir.should == '/etc/puppet'
+ etcdir = Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS,
"puppet", "etc") : '/etc/puppet'
+ # REMIND: issue with windows backslashes
+ @run_mode.conf_dir.should == File.expand_path(etcdir)
end
it "should have confdir ~/.puppet when run as non-root" do
@@ -19,7 +21,9 @@ describe Puppet::Util::RunMode, :fails_on_windows => true do
it "should have vardir /var/lib/puppet when run as root" do
Puppet.features.stubs(:root?).returns(true)
- @run_mode.var_dir.should == '/var/lib/puppet'
+ vardir = Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS,
"puppet", "var") : '/var/lib/puppet'
+ # REMIND: issue with windows backslashes
+ @run_mode.var_dir.should == File.expand_path(vardir)
end
it "should have vardir ~/.puppet/var when run as non-root" do
--
1.7.5.4
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
