diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-18 23:40:17 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-07-19 14:08:38 -0700 |
| commit | 0e4ae653c0628cb0df9ccace98bca4bc7478fb7c (patch) | |
| tree | fa90342427d0cd41c6aea56df8d89d2deb3def9d /spec/integration/util | |
| parent | 8d56355981961fd1c4a358992930bbb80325fea7 (diff) | |
| download | puppet-0e4ae653c0628cb0df9ccace98bca4bc7478fb7c.tar.gz puppet-0e4ae653c0628cb0df9ccace98bca4bc7478fb7c.tar.xz puppet-0e4ae653c0628cb0df9ccace98bca4bc7478fb7c.zip | |
Maint: Fix miscellaneous tests
Several tests were broken due to pecularities of Windows
and Ruby on Windows:
* Ruby on windows does not differentiate between group and
other file permissions.
* All open file handles must be closed before the file can
be deleted
* Sometimes the current working directory (Dir.getwd) is
reported as C:/foo and other times as C:\\foo, which
confuses the spec tests.
* Ruby's sprintf formats floating point values differently
on Windows vs Unix. The Windows exponent has an extra
leading zero.
* Needed to stub execution of security command with the
SMF service provider.
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
Diffstat (limited to 'spec/integration/util')
| -rwxr-xr-x | spec/integration/util/settings_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/util/settings_spec.rb b/spec/integration/util/settings_spec.rb index b05c63107..46d783c4e 100755 --- a/spec/integration/util/settings_spec.rb +++ b/spec/integration/util/settings_spec.rb @@ -18,12 +18,12 @@ describe Puppet::Util::Settings do File.should be_directory(settings[:maindir]) end - it "should make its directories with the corret modes" do + it "should make its directories with the correct modes" do settings = Puppet::Util::Settings.new settings.setdefaults :main, minimal_default_settings.update( :maindir => {:default => tmpfile("main"), :desc => "a", :mode => 0750} ) settings.use(:main) - (File.stat(settings[:maindir]).mode & 007777).should == 0750 + (File.stat(settings[:maindir]).mode & 007777).should == (Puppet.features.microsoft_windows? ? 0755 : 0750) end end |
