diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-29 10:45:52 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-07-29 10:45:52 -0700 |
| commit | cd1e501b6ebba6f7b109c0591452a459a95c43da (patch) | |
| tree | 754c8edc6f064a5ea79258bb4b3e764d8e673579 /spec/unit | |
| parent | ca3396e827d4abd0350440223d0925d685a3caa5 (diff) | |
| parent | f6006177a85766cfb3387db6c3d337bf97b52f17 (diff) | |
Merge branch 'ticket/master/8660-default-windows-install-paths'
* ticket/master/8660-default-windows-install-paths:
(#8660) Fix destdir option on Windows
(#8660) Default config dir to %PROGRAMDATA% on Windows
Diffstat (limited to 'spec/unit')
| -rwxr-xr-x | spec/unit/util/run_mode_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/util/run_mode_spec.rb b/spec/unit/util/run_mode_spec.rb index 5d9a3d058..f2303ccc2 100755 --- a/spec/unit/util/run_mode_spec.rb +++ b/spec/unit/util/run_mode_spec.rb @@ -8,7 +8,7 @@ describe Puppet::Util::RunMode do it "should have confdir /etc/puppet when run as root" do Puppet.features.stubs(:root?).returns(true) - etcdir = Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "etc") : '/etc/puppet' + etcdir = Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "etc") : '/etc/puppet' # REMIND: issue with windows backslashes @run_mode.conf_dir.should == File.expand_path(etcdir) end @@ -21,7 +21,7 @@ describe Puppet::Util::RunMode do it "should have vardir /var/lib/puppet when run as root" do Puppet.features.stubs(:root?).returns(true) - vardir = Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "var") : '/var/lib/puppet' + vardir = Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var") : '/var/lib/puppet' # REMIND: issue with windows backslashes @run_mode.var_dir.should == File.expand_path(vardir) end |